merge of '1ebb8320b743c004de3edbcfb17ea43a7cfbe6b2'
authorKoen Kooi <koen@openembedded.org>
Mon, 4 Aug 2008 13:15:27 +0000 (13:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 4 Aug 2008 13:15:27 +0000 (13:15 +0000)
     and '5f904f7a12f760543efbb50eed318ac4e50f6558'


Trivial merge