merge of '5ebc68ac23faeb96effdf4f594c20c57c3f1ab5c'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 25 Jun 2008 16:14:42 +0000 (16:14 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 25 Jun 2008 16:14:42 +0000 (16:14 +0000)
     and '85a1e5d843207f3fcf6f1043a822a543e89cc938'


Trivial merge