merge of '16b18b01df378ad0f697c10d317c111597758115'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jul 2008 13:56:46 +0000 (13:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jul 2008 13:56:46 +0000 (13:56 +0000)
     and '932cae8c439fdcbb8ef77c53d64c68c31d21f984'


Trivial merge