merge of '0c2d5d5458d1b1d0d5206b62671a36916592392a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 16 Jan 2008 21:01:37 +0000 (21:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 16 Jan 2008 21:01:37 +0000 (21:01 +0000)
     and 'cb0f0a066b9df17408c3017f7954a6b750fd269f'


Trivial merge