merge of 'd39fcbb20e8ed63ddeb563f8bcffc41b528163cd'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 14 Jul 2008 11:20:50 +0000 (11:20 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 14 Jul 2008 11:20:50 +0000 (11:20 +0000)
     and 'dff33d19f55f5e1289901a814a5e358b4a4a9981'


Trivial merge