merge of 'bd40bda8858164c7f6d35494b85fbc1df9474e4d'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 20 Jul 2008 13:18:34 +0000 (13:18 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 20 Jul 2008 13:18:34 +0000 (13:18 +0000)
commit7c196f7439f45d4553120433ce14c6cfb1bbb283
treef55baf5b40e6c64dc0ecb6917c570de2de1228b9
parenta2f3bda7c838e1e5750e0ea96096f2b3de6590fe
parent8bfe7840506521511b483b44f7d9d55fc09b03ca
Merge ... 'bd40bda8858164c7f6d35494b85fbc1df9474e4d'
     and 'e73a25058e540cd7bb73833d96eb62b9a797b637'