merge of '5df8864bb6077e592cab2f4f7568f207380225e4'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 13 Jun 2008 20:10:45 +0000 (20:10 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 13 Jun 2008 20:10:45 +0000 (20:10 +0000)
     and 'e2cb5d1e0ecaf7ec345106320eaa9ab93d254714'


Trivial merge