merge of '0f8f649521fff401e2d8ec3f053ed9378b84ad4d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 3 May 2008 19:18:21 +0000 (19:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 3 May 2008 19:18:21 +0000 (19:18 +0000)
     and '737ced6a79f80f5d666816c42ce1938783ee1494'


Trivial merge