merge of '301e1ffe69b9e744a6702f0822275dacebc4fbb5'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Apr 2007 12:37:30 +0000 (12:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Apr 2007 12:37:30 +0000 (12:37 +0000)
     and 'fc321e37b7fdc2cf0f592c29029177c9e1c4c6a9'


Trivial merge