merge of '0d10da095e95a24a892ade5cac920039ad878ceb'
authorKoen Kooi <koen@openembedded.org>
Fri, 19 Oct 2007 19:46:09 +0000 (19:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 19 Oct 2007 19:46:09 +0000 (19:46 +0000)
     and '55a31408b86b4036d83b855bbd46f1b1d7a61765'


Trivial merge