merge of 'b0902151107c9e0c0fc121ba37c6b72aad2172f9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Mar 2007 16:47:25 +0000 (16:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Mar 2007 16:47:25 +0000 (16:47 +0000)
     and 'ecb927de3eaab5791424a9ef99e3e3a97c12c7b3'


Trivial merge