merge of '1e903c1b7aaf83f6d6191a71231f8862e397e14c'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 7 Jul 2008 19:06:13 +0000 (19:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 7 Jul 2008 19:06:13 +0000 (19:06 +0000)
     and 'da05681cb6f999dad9c83e628cb1825a48233318'


Trivial merge