merge of '597405ebde19640675e0298f9206b90ef981a115'
authorKoen Kooi <koen@openembedded.org>
Sat, 6 Jan 2007 17:34:59 +0000 (17:34 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 6 Jan 2007 17:34:59 +0000 (17:34 +0000)
     and '99de646e9cb82eeb39c4f398143893df2395644f'


Trivial merge