merge of '7c5d468e4126d275fd4f17ccdc3a160b3e0b09a5'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 28 Aug 2007 01:25:15 +0000 (01:25 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 28 Aug 2007 01:25:15 +0000 (01:25 +0000)
commit446ce329e2b6d14f48efe4dcf3cd78234bc2e0fc
tree412a37134e920756a9ed102e89210b67f8f3f456
parent3386c0687879290cb80b29a9fd39754f533ddb14
parent5522ece8da310438a9c65aeaa50b86f161540f46
Merge ... '7c5d468e4126d275fd4f17ccdc3a160b3e0b09a5'
     and '9e3f287c579cb592207f2e225ab8735174982867'