merge of 'e18d2142fbd0a6fe86b6cb56dab8ba29dcfa56d6'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 12 Jan 2008 16:11:45 +0000 (16:11 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 12 Jan 2008 16:11:45 +0000 (16:11 +0000)
     and 'fc9ea88e83e327d8456fd79595597c637950b850'


Trivial merge