merge of '2e9358fe57665ae0d14365c94a62792b10e1b578'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 9 Oct 2008 08:00:09 +0000 (08:00 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 9 Oct 2008 08:00:09 +0000 (08:00 +0000)
     and 'b926346694764187095a5101a505ba5ad9128a78'


Trivial merge