merge of 'a6e949d7541dc3ab2d5697151c861cfd4a2efa87'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jun 2008 21:38:11 +0000 (21:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jun 2008 21:38:11 +0000 (21:38 +0000)
     and 'f710df9bab62719eadc5ac425bbc8e07f2e5f704'


Trivial merge