merge of 4a52b2abf7680da958a90ec6fd03a53027731946
authorKoen Kooi <koen@openembedded.org>
Mon, 1 Aug 2005 09:56:43 +0000 (09:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Aug 2005 09:56:43 +0000 (09:56 +0000)
     and 7ef6035dfceaecf4b902f0aa0277a7de73566580


Trivial merge