merge of '045e00ff4301aa05fddab174a3ac5bf9c260343b'
authorKoen Kooi <koen@openembedded.org>
Wed, 27 Aug 2008 13:19:23 +0000 (13:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 27 Aug 2008 13:19:23 +0000 (13:19 +0000)
     and '90204f8950d2ea5d6cc182ba36902a2e41bdfc7e'


Trivial merge