merge of '75e4095a9816b7a65c750da67be498a5b789f290'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 17 Mar 2007 14:32:55 +0000 (14:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 17 Mar 2007 14:32:55 +0000 (14:32 +0000)
     and '98be4107db55c27eb7181aa8147632bb707ea7a7'


Trivial merge