merge of 93a7ad23db8afae5e3440a5866caf7bf2f8ee416
authorKoen Kooi <koen@openembedded.org>
Thu, 18 May 2006 14:08:12 +0000 (14:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 May 2006 14:08:12 +0000 (14:08 +0000)
     and e2cc7febcaa769d78c69fc489e6318305e12313d


Trivial merge