merge of 002a1f51b953da649d96ae8ecdac59ea1ae42bd5
authorKoen Kooi <koen@openembedded.org>
Mon, 18 Jul 2005 22:59:16 +0000 (22:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Jul 2005 22:59:16 +0000 (22:59 +0000)
     and e109156250767b8fafcee6f70ed990161ec858d1


Trivial merge