merge of '4814b69151af2e49760bb9a3837c26ca674a7636'
authorKoen Kooi <koen@openembedded.org>
Tue, 14 Oct 2008 11:55:02 +0000 (11:55 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 14 Oct 2008 11:55:02 +0000 (11:55 +0000)
     and '6d598225ef381f53c7c567f433cb8223d13f098e'


Trivial merge