merge of '06dece86b19a87ce894b51a9a4596d0dd10aa368'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jul 2007 11:14:05 +0000 (11:14 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jul 2007 11:14:05 +0000 (11:14 +0000)
commit926bfde12c8d306e07ae1ca293b6b0fb38bf6852
tree38318a1382597d94dcf64c98bcecdc361459f4f7
parenta17dbe910a0394ae6ad77a013030b1869c4b82df
parentf93a8fefcc42bbb871d1b26e9a814c08954c42c7
Merge ... '06dece86b19a87ce894b51a9a4596d0dd10aa368'
     and 'f6d341299c43235d3c37dbbb33a02a56ea8370c3'