merge of '608b2b53305bf9caac347482f81437fb57e6205b'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 11 Jul 2008 09:12:33 +0000 (09:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 11 Jul 2008 09:12:33 +0000 (09:12 +0000)
     and '762688ff3c4f669a807e2559bb786cc82118b7bb'


Trivial merge