merge of '57f7077b81d445e3b77f5f1a68139c49a941d322'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 7 Feb 2008 15:45:57 +0000 (15:45 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 7 Feb 2008 15:45:57 +0000 (15:45 +0000)
     and 'dcb061c2db7bd0edf1205099c9919c1144157b03'


Trivial merge