merge of '5b4101eded60b084a2015b66d47b04a99222e842'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 23:44:31 +0000 (23:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 23:44:31 +0000 (23:44 +0000)
     and 'c72441dc719a5903a8fdc705f309c086346249b0'


Trivial merge