merge of '49b1d83eae7f83143eba2ca3c77c40ebb33a61cc'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 01:23:16 +0000 (01:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 01:23:16 +0000 (01:23 +0000)
     and 'ae2c3da1cb5d209add155e318d2befb8b40328b6'


Trivial merge