merge of 'a1f690feff27a3cf8c220262f43412c6cefd8638'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 15 Mar 2007 15:18:06 +0000 (15:18 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 15 Mar 2007 15:18:06 +0000 (15:18 +0000)
     and 'e7fbe6e21edb50535d695aa0668f424883d1c7a3'


Trivial merge