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)
commit3515feb8a17b9d84bee4d11191842223ce6f76a6
tree38c0d802f3d26d3ac11937427d0221b04c0d0a01
parent12bbfc94ec84e9b899d7d519aaf1181ef2590183
parentec3c76692048d3401a3ce0a7cb1ae2231d45c41e
Merge ... '33fb6aa0bcede524e3a5d6d9f4e9ed212a2c2335'
     and 'b21b578d6a02e2eb83b67423222b1cb7e6fcfc49'