merge of '425c65549a13b612465a7a2f4e273d993f692a31'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 4 Mar 2008 15:27:06 +0000 (15:27 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 4 Mar 2008 15:27:06 +0000 (15:27 +0000)
     and '5c59665d0dd415bc5372cdf976b15c13956e6f36'


Trivial merge