merge of '1550600acee1d36cd658420fd1cfaaa1e57c7127'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 4 Apr 2007 12:17:43 +0000 (12:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 4 Apr 2007 12:17:43 +0000 (12:17 +0000)
     and 'b08044fef3b3cdf0bdd7f1a8b8c18363c0fb688f'


Trivial merge