merge of 014c14278f078f6dfed141f49e7c46dc3a059ae9
authorKoen Kooi <koen@openembedded.org>
Mon, 12 Sep 2005 10:13:14 +0000 (10:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Sep 2005 10:13:14 +0000 (10:13 +0000)
     and 8decd470419c4875b29486bd2b5a7012bedb9427


Trivial merge