merge of '34022eff29a839f8a6463586208fafbffd94e083'
authorKoen Kooi <koen@openembedded.org>
Fri, 7 Dec 2007 11:18:18 +0000 (11:18 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 7 Dec 2007 11:18:18 +0000 (11:18 +0000)
     and '7444d12b1f1d463507de1ebfd203527718c89cfa'


Trivial merge