merge of 1a66dacb1592037ea25fd0a5aab56279ccdc2472
authorMichael Lauer <mickey@vanille-media.de>
Thu, 3 Aug 2006 17:22:56 +0000 (17:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 3 Aug 2006 17:22:56 +0000 (17:22 +0000)
commit32f4f9498cde7ff23b12edca0174f6dbe48a1175
treeff6195d3ace9845dcab0911798baeb3e9b5cf215
parentde2f7350cfcbe11d0861d0cf23719e918f164475
parentfa08b5eb737a79621f97a103aef3fbcb28dc4053
merge of 1a66dacb1592037ea25fd0a5aab56279ccdc2472
     and 3c7a41a2de382cc83b03dee39ff407017f1f13d8