merge of '860bccc90a045f54a0fd143d4759959d43643350'
authorKoen Kooi <koen@openembedded.org>
Sun, 18 May 2008 12:00:22 +0000 (12:00 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 18 May 2008 12:00:22 +0000 (12:00 +0000)
     and 'd0e6322f95c05a9799955013d3c7dba65d4cc401'


Trivial merge