merge of '0a4c4e919413e2fd4aff39b1053c41c247b9c30f'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 2 Jul 2008 13:24:59 +0000 (13:24 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 2 Jul 2008 13:24:59 +0000 (13:24 +0000)
     and 'f63d89980b66ed036447c254c9d7b544d095d25a'


Trivial merge