merge of '9bdc778b4db6a77bfd983ea418ef07f57f411bcd'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 16 Nov 2007 13:04:18 +0000 (13:04 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 16 Nov 2007 13:04:18 +0000 (13:04 +0000)
     and 'f04ba9d8f1f4caa6f8c95f3fec8cd70c6cde452c'


Trivial merge