merge of '1fc4ea9615a3789569ba8f07b7090012fce2afbf'
authorKoen Kooi <koen@openembedded.org>
Sun, 18 Feb 2007 11:35:36 +0000 (11:35 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 18 Feb 2007 11:35:36 +0000 (11:35 +0000)
     and 'e63a2eefb4ae9542b7ac7ee72c2f0aad1d534886'


Trivial merge