merge of '3a46b29cc934022c7df085ba522531c57df6de56'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 10 Oct 2008 14:27:44 +0000 (14:27 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 10 Oct 2008 14:27:44 +0000 (14:27 +0000)
     and 'c3be7d35a09514cd7f28929bb60b9f7801d12c54'


Trivial merge