merge of '42eff26099cde8822773944e3b244f74387ef7cc'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 8 Mar 2008 12:02:37 +0000 (12:02 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 8 Mar 2008 12:02:37 +0000 (12:02 +0000)
     and 'd2b1667a830019b8580dcf05a70b8e95329e9e25'


Trivial merge