merge of '33d36c3f90d3f3338d861f53c982c88ecc127201'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 19 Aug 2007 17:32:08 +0000 (17:32 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 19 Aug 2007 17:32:08 +0000 (17:32 +0000)
     and '4fe73431c4f4506a83505d3043fbedb9763f1983'


Trivial merge