merge of '5a91122748a2eff5f19fc8d9fdd0d6d0b748f3d8'
authorKoen Kooi <koen@openembedded.org>
Wed, 27 Sep 2006 13:52:52 +0000 (13:52 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 27 Sep 2006 13:52:52 +0000 (13:52 +0000)
     and 'c594e84e99724db9f4ac0766c2e20018944b0ebe'


Trivial merge