merge of '32e15a2c3c11153e8886b20192817c1ff773b323'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 10 Mar 2008 23:58:54 +0000 (23:58 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 10 Mar 2008 23:58:54 +0000 (23:58 +0000)
     and '5ecfc6cd9727453503405bbb7de81a74344de218'


Trivial merge