merge of '7484bb8b957706d9249511a6a73b62f70db94929'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 15 Oct 2006 14:42:29 +0000 (14:42 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 15 Oct 2006 14:42:29 +0000 (14:42 +0000)
     and 'cd494fdef6a7adeea4481f5aee353408cbfaf6f4'


Trivial merge