merge of 'a1b53f4890a543077cd9692d6f36d55601cf5cba'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 11 Apr 2008 10:17:01 +0000 (10:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 11 Apr 2008 10:17:01 +0000 (10:17 +0000)
     and 'e7f793242547302eb26367c08896596376eba484'


Trivial merge