merge of 'd1d4ee2c6e573657511ea5110c7b0ff2cd6b7ba8'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 17 Sep 2007 16:14:47 +0000 (16:14 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 17 Sep 2007 16:14:47 +0000 (16:14 +0000)
     and 'd22fdb6dd89df0e5bc4ba3614166c769bb207126'


Trivial merge