merge of '15632785e576f4fbbf9cdccf18d8aae806bec193'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 4 Aug 2007 20:47:30 +0000 (20:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 4 Aug 2007 20:47:30 +0000 (20:47 +0000)
     and 'dace6576f510b1f3af99d9580e3f0d3d18a773b1'


Trivial merge