merge of '2be5e752a15904554697d31fe1505320d26fd263'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Feb 2008 01:43:08 +0000 (01:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Feb 2008 01:43:08 +0000 (01:43 +0000)
     and '7fb87889a6d8866e49a6b9607971f63a17c58c80'


Trivial merge