merge of '09258eafc3e7182a15978e372af12800698031ce'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 28 Jul 2008 16:31:07 +0000 (16:31 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 28 Jul 2008 16:31:07 +0000 (16:31 +0000)
     and '96d88977407dc82a4987de86d47802dd8322556f'


Trivial merge