merge of '3e8965009ac2c5ba88f4da142a27d3b08cceea4d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jul 2007 08:27:56 +0000 (08:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jul 2007 08:27:56 +0000 (08:27 +0000)
     and '624d58c48d06c252e55d2ebabdc8d9b58cbc7452'


Trivial merge