merge of 7a7b09b428b0fc588bb40bec9d545736c70956e8
authorKoen Kooi <koen@openembedded.org>
Wed, 3 Aug 2005 09:41:04 +0000 (09:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Aug 2005 09:41:04 +0000 (09:41 +0000)
     and 7ab1b01cd9231fe128eea9ab71f6ec45d2dbd6bf


Trivial merge