merge of '3e42312311412182ba8645d4302c9621a58bc2a6'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 9 Mar 2008 13:53:05 +0000 (13:53 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 9 Mar 2008 13:53:05 +0000 (13:53 +0000)
     and 'a24d351d91e6596efe9b833b0d983a12bdb3b0ec'


Trivial merge