merge of '1eb03bbc471949379b938272d92c72d53e7dbd66'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 5 Nov 2007 14:00:27 +0000 (14:00 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 5 Nov 2007 14:00:27 +0000 (14:00 +0000)
     and '834b1d3768e14c34c382aac26ffc80848dc8c213'


Trivial merge