merge of '23575cb366ac6706d85f4cc91b22f06ce1e10a0d'
authorKoen Kooi <koen@openembedded.org>
Thu, 2 Oct 2008 11:26:22 +0000 (11:26 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 2 Oct 2008 11:26:22 +0000 (11:26 +0000)
     and 'd6babd021e3bde4e1d827d07c1af7154a6569ab7'


Trivial merge