merge of '3dbb1098a936a64f470f96db6fb6810f8b872d3b'
authorKoen Kooi <koen@openembedded.org>
Thu, 21 Dec 2006 17:35:10 +0000 (17:35 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 21 Dec 2006 17:35:10 +0000 (17:35 +0000)
     and 'a083f4b0be32b70cc5c23132ddad82240c468721'


Trivial merge