merge of '15b7eadc9952c4f918a8390a157c5b9c400e4394'
authorKoen Kooi <koen@openembedded.org>
Sat, 28 Oct 2006 14:00:49 +0000 (14:00 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 28 Oct 2006 14:00:49 +0000 (14:00 +0000)
     and '24a92b152eddaf3edef74b529a0c7f06bd5e060c'


Trivial merge