merge of '0f5fc910a03052e7b935c22cf24e1235f9cc1576'
authorKoen Kooi <koen@openembedded.org>
Sat, 2 Sep 2006 11:32:06 +0000 (11:32 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 2 Sep 2006 11:32:06 +0000 (11:32 +0000)
     and '7881a5c74b4a349705d81ae3d969459001a9e1da'


Trivial merge