merge of '1427a8ede5b7d37a89b207e3552cbe6a842fcc22'
authorKoen Kooi <koen@openembedded.org>
Fri, 3 Oct 2008 08:56:06 +0000 (08:56 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 3 Oct 2008 08:56:06 +0000 (08:56 +0000)
     and 'c9705f706a05f04be17dd411ebb566e068b9dc83'


Trivial merge