merge of '6f164d924ef877e9361c0f48667e2ef44a9addcc'
authorKoen Kooi <koen@openembedded.org>
Wed, 10 Oct 2007 08:57:19 +0000 (08:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 10 Oct 2007 08:57:19 +0000 (08:57 +0000)
     and 'ada2b5e6f0e360127442cd1510cd4740e48a91e8'


Trivial merge