merge of '269c1d3f7a6a873041635f5ec41aacff978e166d'
authorKoen Kooi <koen@openembedded.org>
Sat, 2 Sep 2006 17:31:51 +0000 (17:31 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 2 Sep 2006 17:31:51 +0000 (17:31 +0000)
     and '6401c65a46b33356819b171a03e513d4de5c0225'


Trivial merge