merge of '1a7d8ef4f2ac682f876865778e2c6db09d211a87'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 24 Jun 2008 16:24:25 +0000 (16:24 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 24 Jun 2008 16:24:25 +0000 (16:24 +0000)
commit212b8e0a0ce35130400d7671792b166273730bab
treeba52b708ba851b0a95d3721e3dc41f68df60b597
parent5392bb78f19b1384e3a5412d59bbcf7ed2c93b1f
parent9c47c678db8c6ddd87f1f1e80a74b5f0b784d8a6
Merge ... '1a7d8ef4f2ac682f876865778e2c6db09d211a87'
     and 'dd270d37a9758c7acdca59383935fd9cadad3aa8'