merge of 'aac87a2141ed5dcc6cf1e3015a21d15463f3d048'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 13 Jun 2008 18:38:48 +0000 (18:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 13 Jun 2008 18:38:48 +0000 (18:38 +0000)
     and 'c407c3e3af9b704a138bada2e0b7c565f8c293be'


Trivial merge