merge of 'ca6fbf391be11c49f263e75d6b8ab2d4fd9211d6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 20 Apr 2008 12:33:50 +0000 (12:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 20 Apr 2008 12:33:50 +0000 (12:33 +0000)
     and 'ff2abfa528baed226e80118e78794712e9f9395f'


Trivial merge