merge of '1f570b878b7faa73a50263f281ff2bad89d0e78b'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 10 Feb 2008 15:14:10 +0000 (15:14 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 10 Feb 2008 15:14:10 +0000 (15:14 +0000)
     and 'be55d0d4fe08efd2bd552157f130e03ccd5ac65a'


Trivial merge