merge of '32e6a3c5d4994942e12a0f14ff64ebd224726e17'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 20:55:23 +0000 (20:55 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 20:55:23 +0000 (20:55 +0000)
     and 'f1d39ac0c47301d60716c311f9babd62a0c15fc2'


Trivial merge