merge of '54570a87efd5af4300ec960e3afaff8b0a1d4b19'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Apr 2008 07:36:12 +0000 (07:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Apr 2008 07:36:12 +0000 (07:36 +0000)
     and '6058c179a37fa5f2a0c6e782d10d5e66c4b1f035'


Trivial merge