merge of '855419893670eddd4f74cc406e9264cde751254c'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 18 May 2008 16:24:38 +0000 (16:24 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 18 May 2008 16:24:38 +0000 (16:24 +0000)
     and 'b57b6f67dc82434a153a6f60215a283ac096b584'


Trivial merge