merge of '4a597627acd6eec179bb1a03405d92cf8b871ac0'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 30 Jul 2007 11:15:39 +0000 (11:15 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 30 Jul 2007 11:15:39 +0000 (11:15 +0000)
commit929f61d2aef5cf85e6d88cdbcf542c838a03bf34
treefa99fe12f0718313365a066d93df646ef6f5ef49
parent22348937cf12a03afe2aaeaa0c297867bb40433b
parent10de3859729ec4a238d66340144a93005fcd0a61
Merge ... '4a597627acd6eec179bb1a03405d92cf8b871ac0'
     and '6c89e16689bde0d5bff8b0e47eea04a458190a56'