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)
     and 'b9301fc2fdf0a9d64d686b1bcffc18be39655752'


Trivial merge