merge of 8df72580b7878605ca810af37d8e7d549d912e3f
authorKoen Kooi <koen@openembedded.org>
Thu, 28 Jul 2005 14:25:03 +0000 (14:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 14:25:03 +0000 (14:25 +0000)
     and f58d6b029802b7b251814cf78a19963b63a0d9fa


Trivial merge