merge of '066c6fcbe98c8444c2fbff69204d0d8606d85077'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 31 Jul 2008 16:10:25 +0000 (16:10 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 31 Jul 2008 16:10:25 +0000 (16:10 +0000)
     and 'db68486a1e4128249ae5f54b7ac2b1278ba29b53'


Trivial merge