merge of '0cb6ae9adc44c4c9b9075a61d9a73a9c2978e89d'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 2 Jul 2008 11:16:56 +0000 (11:16 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 2 Jul 2008 11:16:56 +0000 (11:16 +0000)
commit102eaa322eb18302832a1059e8ba1f12aeb5a679
treea5c3293a3b9bce431d490c6ae6bda589c82267dd
parent5277518d2a2ca1d93bda682afe60bc7846756c41
parent1f8940a24bafee2acced9263def2a0816155cd60
Merge ... '0cb6ae9adc44c4c9b9075a61d9a73a9c2978e89d'
     and '61916fde303a24e027564cf07127b974edcf2ce8'