merge of '68b677cc5ae237d521b127e852086eac5d000fd4'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 21 Jul 2007 13:13:14 +0000 (13:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 21 Jul 2007 13:13:14 +0000 (13:13 +0000)
     and 'e520909be2622e4bbdf3326729ffc870686d568e'


Trivial merge