merge of '40faf7d48d883c5cd0bb74d8c212de805ef7cdf3'
authorKoen Kooi <koen@openembedded.org>
Fri, 7 Dec 2007 10:18:10 +0000 (10:18 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 7 Dec 2007 10:18:10 +0000 (10:18 +0000)
     and 'f564197dcff7dea800a0dcabf27c4809e2521c8c'


Trivial merge