merge of 'dfe542a129a68cf1ad09b99b69533dacab99aa45'
authorKoen Kooi <koen@openembedded.org>
Tue, 20 Feb 2007 08:02:45 +0000 (08:02 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 20 Feb 2007 08:02:45 +0000 (08:02 +0000)
     and 'f8ba681a759e18c7e1b2aa54b3dae1efb1b41eea'


Trivial merge