merge of '19a2cb87b3e7d9ea6e805a2c82a7c53b91e77511'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Jul 2007 12:22:46 +0000 (12:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Jul 2007 12:22:46 +0000 (12:22 +0000)
     and 'cec84fe6219f4a80315904254a401430604678dd'


Trivial merge