merge of '44147c36bbb2a3438d57b6293a393355eeffc48b'
authorKoen Kooi <koen@openembedded.org>
Wed, 6 Aug 2008 16:10:30 +0000 (16:10 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 6 Aug 2008 16:10:30 +0000 (16:10 +0000)
commitf60997f5a23ce7f9e1c9ace5dd52bdb22d5cbb68
treee7c1a52debfaea1f989adc5057eff88ef0930f26
parentc5718e16d08d73a48642840dd8ad532734fb5942
parentf22b368f756c2e165b3a015da98a02232d77cef2
Merge ... '44147c36bbb2a3438d57b6293a393355eeffc48b'
     and 'b9301fc2fdf0a9d64d686b1bcffc18be39655752'