merge of '8728ab154063ad389826d041d5c22bd3587f3372'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 25 Dec 2007 13:46:47 +0000 (13:46 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 25 Dec 2007 13:46:47 +0000 (13:46 +0000)
     and 'acf2917a94a9bba36e944b0ad3ee532e3fc10eaf'


Trivial merge