merge of '0c8907e0f2b5bf5a3285e92be17c709e5d0ffa79'
authorKoen Kooi <koen@openembedded.org>
Wed, 17 Oct 2007 13:29:32 +0000 (13:29 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 17 Oct 2007 13:29:32 +0000 (13:29 +0000)
     and '908d37bd47fa2dc11cfb3cb7a8925330fbf6163d'


Trivial merge