merge of '6fba3dd9aacc87c46cb6ad12712c76d7f07ec4ee'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Feb 2007 18:17:56 +0000 (18:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Feb 2007 18:17:56 +0000 (18:17 +0000)
     and 'c7087b824ad0e4d13f3e6b73315febe510397afb'


Trivial merge