merge of '854af845cc8e7d6a3ae568387115eb89f78fba82'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 20 May 2008 14:29:42 +0000 (14:29 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 20 May 2008 14:29:42 +0000 (14:29 +0000)
     and 'b580e935f43d469d6a35f9c89515741825cb9375'


Trivial merge