merge of '981cc5dae86118a7c743b3f8ad711e7763194aae'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 18:29:33 +0000 (18:29 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 18:29:33 +0000 (18:29 +0000)
     and 'e991ee5c3b5bbf092467b905481b36d1fde8d2de'


Trivial merge