merge of '16286a015e02dffbcbc2f42586e7402f16dba818'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 24 Jul 2008 08:52:10 +0000 (08:52 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 24 Jul 2008 08:52:10 +0000 (08:52 +0000)
     and '4e6e5c3a6954f62ae6b6233d225415fb8a185151'


Trivial merge