merge of '70c98ecabf04e753c02721c28eb68c90f324d6de'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 22 Oct 2007 16:32:50 +0000 (16:32 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 22 Oct 2007 16:32:50 +0000 (16:32 +0000)
     and 'cebb5151b05a1bb90d6e82d3f2b9883930c5dc35'


Trivial merge