merge of '0af83053cd30ecb7da6ef9c1ff0309caecfe1cbf'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 15 Jun 2007 16:13:21 +0000 (16:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 15 Jun 2007 16:13:21 +0000 (16:13 +0000)
     and '13d4cd86cb7a8b154e1c94e78f516bb378d335e4'


Trivial merge