merge of '0a9f13e573f898d652f74fb5614964dd53e3ff46'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 28 Sep 2008 18:44:40 +0000 (18:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 28 Sep 2008 18:44:40 +0000 (18:44 +0000)
     and '84184cc683b97b9e1637721ea024604a13d90609'


Trivial merge