merge of 'c038e0efea1f81ad9c7092f84a3bd377a19e712b'
authorKoen Kooi <koen@openembedded.org>
Tue, 3 Jul 2007 12:09:05 +0000 (12:09 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 3 Jul 2007 12:09:05 +0000 (12:09 +0000)
     and 'edcd7cc3ce3933c1022989d2297e120211a6d3fa'


Trivial merge