merge of '1887e05997e5d1f748a52eec6b2d13c49a073d4c'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 30 Dec 2007 16:44:17 +0000 (16:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 30 Dec 2007 16:44:17 +0000 (16:44 +0000)
commit99d6885374c4957e8a1b61c4dc23a7d770f3f6d9
tree2b3f90497d5d29cdb6661e9b9206c4c5cdde2699
parent7144ec4e6439c5d16f2c168f62a0741412f6bff5
parent52d47eefac6f3629f38c08aba37d6753337b5207
Merge ... '1887e05997e5d1f748a52eec6b2d13c49a073d4c'
     and '3097cec884e81b132a9e898dffce71a333d6484c'