merge of '7de9efd25ebd277708839391729cb80643e6176f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 16 Jan 2008 21:00:50 +0000 (21:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 16 Jan 2008 21:00:50 +0000 (21:00 +0000)
     and '92e328e5850b31fc0e02edfca17a6b0d71575461'


Trivial merge