merge of '34310ed029b0ccbcd834f89fcea4e24c5d044ecc'
authorKoen Kooi <koen@openembedded.org>
Fri, 22 Jun 2007 18:28:19 +0000 (18:28 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 22 Jun 2007 18:28:19 +0000 (18:28 +0000)
     and 'e2e2ace957e66ed034ec39428d251e7ed9d0bb50'


Trivial merge