merge of '175617edcda6a7db0736cb199971e613308f4f28'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 15 May 2008 21:22:00 +0000 (21:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 15 May 2008 21:22:00 +0000 (21:22 +0000)
commit51755d3df0e8ca4458fa788229bf84a02d12bf7a
tree6d6759b24bdfe7612655c5eafa7aa657bce4d9b2
parentfe972d7a8486bd36f1484330ecb50979a8d987a1
parenta93ce1304819b8250f5f8088e63483fef453f829
Merge ... '175617edcda6a7db0736cb199971e613308f4f28'
     and 'e53a5cd6a7325c8cfa3079fff6e7e086127f125c'