merge of '5ffcacd9125004bbcb65a5f2d933272d313bee84'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 19 May 2008 00:19:25 +0000 (00:19 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 19 May 2008 00:19:25 +0000 (00:19 +0000)
commited8124e6f54fb0b1baa02bc443f1d4bf419bae35
treee61f0367d7de17a76f87fa9701047cb82f568751
parent1eb0034152636b9945af02360af6ca8be131d671
parent5e2947cec6215bdce81b2359e0ea79320e675637
Merge ... '5ffcacd9125004bbcb65a5f2d933272d313bee84'
     and 'd78b6d9ef4e4f3d1ced7dfccfda038bcffbb221c'