merge of '2098d6e0cf6da177c9c29ab698039d0012c237cf'
authorKoen Kooi <koen@openembedded.org>
Wed, 23 Aug 2006 11:20:01 +0000 (11:20 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 23 Aug 2006 11:20:01 +0000 (11:20 +0000)
     and 'ba1e4402b3fca3d076d401b99e8e14999910d0e5'


Trivial merge