merge of '623fafc1c9ff4db42529f744cc912543a470ddf9'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 12 Jan 2008 15:56:04 +0000 (15:56 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 12 Jan 2008 15:56:04 +0000 (15:56 +0000)
     and 'ebeb227101b1899f5c93f0de60933eaaeb3ac6e1'


Trivial merge