merge of '3cf7e5f6eed59497a0164a981af89d6bd0f96fae'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 29 Aug 2008 09:03:23 +0000 (09:03 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 29 Aug 2008 09:03:23 +0000 (09:03 +0000)
     and 'f51fb525f916aeb12bcca0e4627daa0b3888de81'


Trivial merge