merge of '2a5739a1dc2a54f1b7807bfd6e053e5b953b6d02'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 7 Jun 2008 18:32:46 +0000 (18:32 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 7 Jun 2008 18:32:46 +0000 (18:32 +0000)
commitdc5badca3d35f936648529a0c22b1ff4d6a86477
treefe0c7951d375764268711e3078078309fdf997bc
parent2761dafea2e12e21f66962e39aa91cca781ad12f
parenteb6aa209e58ba83571bcd1ed01cad7b171d38ba2
Merge ... '2a5739a1dc2a54f1b7807bfd6e053e5b953b6d02'
     and '82ea7fb33a9e64c710458f33fd0c1649c08f7e01'