merge of '7f7e2abbafbc78c693195ccd3ecbc44742312157'
authorKoen Kooi <koen@openembedded.org>
Tue, 28 Aug 2007 03:06:24 +0000 (03:06 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 28 Aug 2007 03:06:24 +0000 (03:06 +0000)
commit6d2c8ffba73f38f1f57e01e6387ac9ba848e5dd6
treefa4b020b5cee4987b46427eb5a22cbf3eb70df95
parent315c290fd97bd98617bea6df56ceeec51041a2d9
parent8fd855f2919e2e33163d38af0c4602cee1240422
Merge ... '7f7e2abbafbc78c693195ccd3ecbc44742312157'
     and 'a3a33729f3f0c0ad0c71c9872010fc1d7dd4f9ee'