merge of '33a35e22030bcab7919a207fd07515e79928efab'
authorKoen Kooi <koen@openembedded.org>
Thu, 14 Sep 2006 11:23:01 +0000 (11:23 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 14 Sep 2006 11:23:01 +0000 (11:23 +0000)
     and '647f04c8db2652dabb7190fe050d069434a1de3a'


Trivial merge