merge of '33fb6aa0bcede524e3a5d6d9f4e9ed212a2c2335'
authorKoen Kooi <koen@openembedded.org>
Thu, 15 Nov 2007 14:10:54 +0000 (14:10 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 15 Nov 2007 14:10:54 +0000 (14:10 +0000)
     and 'b21b578d6a02e2eb83b67423222b1cb7e6fcfc49'


Trivial merge