merge of '2d7114b5bd553a86afdf241ba00411ba1e6d9bec'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 8 Feb 2008 23:11:47 +0000 (23:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 8 Feb 2008 23:11:47 +0000 (23:11 +0000)
     and '2e4d5c372cfad0e6d1d535ecbebee7006a637b97'


Trivial merge