merge of '0088316df3061919a20637a41044dc15844fd050'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 1 Mar 2008 16:57:44 +0000 (16:57 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 1 Mar 2008 16:57:44 +0000 (16:57 +0000)
     and 'da5e0ed70f6c251be956cc03725872ed4094d823'


Trivial merge