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)
commit7171e115d170392689aeb662c5c4381b3275f69d
tree84cabe27cf519c5fb283e2e2e00f8d1b5407dd1a
parent194e9539227c960636ef5b6332aede195c32b2c9
parentc0539a99fb0c369c128a6c471248160cf5fa375a
Merge ... '5a91122748a2eff5f19fc8d9fdd0d6d0b748f3d8'
     and 'c594e84e99724db9f4ac0766c2e20018944b0ebe'