merge of '73811d7124650e66801380a8372e169d5ed3e6bf'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 4 Nov 2007 16:34:48 +0000 (16:34 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 4 Nov 2007 16:34:48 +0000 (16:34 +0000)
     and 'f76a52136a0ce25511ba98b2e3b3b6d52dd6af11'


Trivial merge