merge of '213c582b00d27a563e968bbcd4a9c276301fc7cc'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 15 Jan 2008 00:41:33 +0000 (00:41 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 15 Jan 2008 00:41:33 +0000 (00:41 +0000)
     and '25cb2cebe575eb9cbee3dab1ae0fa81368eb3bc6'


Trivial merge