merge of 'bc5087d2ff20b3a1f43d573613a883bbc0594976'
authorKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 14:27:22 +0000 (14:27 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 14:27:22 +0000 (14:27 +0000)
     and 'dae6d011c2090a45ec8d231d5e568e3e12289f6b'


Trivial merge