merge of 'bc14395624375a26acbbd5e4c92900e2e5e456f0'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 13 Jun 2007 17:31:37 +0000 (17:31 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 13 Jun 2007 17:31:37 +0000 (17:31 +0000)
commit49fc40335631daf60d2ead73ca6e346d52b0f305
treef5bd9553945ef5bc014068a389707376b96c5e4b
parent3ddc7888534e1c11c5a64b67aa2276f1baa57811
parenta28b3ce0ceda1bb468005d0950cb2f9b453ac68b
Merge ... 'bc14395624375a26acbbd5e4c92900e2e5e456f0'
     and 'dfe282821bb00a1e4097acfcf4e97e3d5169bdc4'