merge of '15cf9b5c7d10125b2cb1fcf7730596f31f503575'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 10 Aug 2007 08:12:30 +0000 (08:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 10 Aug 2007 08:12:30 +0000 (08:12 +0000)
     and '4dfed09d2c25ca9f6bbf41b662fe678ff0849e93'


Trivial merge