merge of '6390f37ba1af225733a09408253deb2c380f9603'
authorKoen Kooi <koen@openembedded.org>
Sat, 6 Jan 2007 13:59:27 +0000 (13:59 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 6 Jan 2007 13:59:27 +0000 (13:59 +0000)
     and '8ce2ae26934b58d193c011f402be69699132abb0'


Trivial merge