merge of '1cbd1bde7832b3e86e5c8ad0fabfa6a90408baf5'
authorKoen Kooi <koen@openembedded.org>
Tue, 22 Aug 2006 11:08:53 +0000 (11:08 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 22 Aug 2006 11:08:53 +0000 (11:08 +0000)
     and 'ca20876bde8f155d49159fb19e6254cf4eaf0b43'


Trivial merge