merge of '78e920edfcc452a246ac6107c6733947f37cf081'
authorKoen Kooi <koen@openembedded.org>
Fri, 5 Sep 2008 12:07:10 +0000 (12:07 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 5 Sep 2008 12:07:10 +0000 (12:07 +0000)
     and '7f3c3e5a83f5d237147a155da9148a52402e6937'


Trivial merge