merge of 'abb30fd9e16aeb04aa9b9ec2dc5e3334abbcd527'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Dec 2007 21:25:30 +0000 (21:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Dec 2007 21:25:30 +0000 (21:25 +0000)
     and 'db54ef97e73876a8f1a87b94c3ccfb09ea36239e'


Trivial merge