merge of '217ef203f57a8879dda7852f93f5619e436ee0d0'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 3 May 2008 19:09:09 +0000 (19:09 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 3 May 2008 19:09:09 +0000 (19:09 +0000)
     and '6480750745f57330fa2e1d460a167e9bfac73bae'


Trivial merge