merge of 'c9189cf531a6d542d7960e099d5ba157da963401'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 08:31:13 +0000 (08:31 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 08:31:13 +0000 (08:31 +0000)
     and 'cdf01a4ca20cb7c2ce18d070d85bd75bcb532cc7'


Trivial merge