merge of '25b0d6183d4d53adbc5ce34a2d340bbc33e6f317'
authorKoen Kooi <koen@openembedded.org>
Tue, 11 Sep 2007 19:33:16 +0000 (19:33 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 11 Sep 2007 19:33:16 +0000 (19:33 +0000)
     and '886e55ab15e14ba83c35f14677aae1a8d68c0f50'


Trivial merge