merge of '04a1a2e0cc7e9b66f26b0c342d210418c07d6127'
authorKoen Kooi <koen@openembedded.org>
Sun, 18 Feb 2007 11:46:35 +0000 (11:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 18 Feb 2007 11:46:35 +0000 (11:46 +0000)
commit06bd533ed1a1dbe243d97401a810d264a1561b98
tree7328719e3bd37d574f52c14caa7d1f536333f373
parentebdcad30d1ca7dedf4f9643ff233480ec82d437e
parentaa5be9a374e7c4279f4d86d299d518538bc7bead
Merge ... '04a1a2e0cc7e9b66f26b0c342d210418c07d6127'
     and '5d9ca4e1f6b8631c921bcc59406fb202e723f586'