merge of '10d887a6bc65bb22550e2964935e1dea718ab462'
authorKoen Kooi <koen@openembedded.org>
Tue, 3 Oct 2006 21:04:39 +0000 (21:04 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 3 Oct 2006 21:04:39 +0000 (21:04 +0000)
     and '5a0ba6276c9c5a55e17b2681a1d2220b37d09582'


Trivial merge