merge of '25c9bf8030ed9b081cb15b534fe5dbd9bf20ad4e'
authorKoen Kooi <koen@openembedded.org>
Sat, 5 May 2007 21:48:57 +0000 (21:48 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 5 May 2007 21:48:57 +0000 (21:48 +0000)
     and '30f2bd37e3e52038872a5a374ce62ae9b90855f6'


Trivial merge