merge of '83199e5f8013253895f505392eddf036d9242fd1'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 24 Aug 2008 16:22:34 +0000 (16:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 24 Aug 2008 16:22:34 +0000 (16:22 +0000)
     and 'dd12cf1614fbdd04c9791735ee944b266f1c6c74'


Trivial merge