merge of '90c9a3c552c3bc731dad4d54e5e92acc8d37eb6d'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 13 Feb 2008 11:21:17 +0000 (11:21 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 13 Feb 2008 11:21:17 +0000 (11:21 +0000)
commitebd8ca1a732bb964f503b170acb87c0a043651c3
tree77df896abe997eab948f790bbbd91e64456215b1
parentd7bb1a5668320a4759b9078e2680215a85fc3751
parentea0ed6298a772fd62b0248717b04ac116f8221b4
Merge ... '90c9a3c552c3bc731dad4d54e5e92acc8d37eb6d'
     and 'f3ae86a7e3727c818dc1f9d62c2fe35ab49f951c'