merge of 21f344c989a3a8ccee3b8cf3bcbae08afeb2a699
authorKoen Kooi <koen@openembedded.org>
Wed, 28 Sep 2005 14:25:27 +0000 (14:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 Sep 2005 14:25:27 +0000 (14:25 +0000)
     and a0a472ec4e6dd3e5e8bbc3fd421eb64f3b8386ea


Trivial merge