merge of '086f28dc642c28a49acc6fa22f6423d6ba5cef7d'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 30 Nov 2007 20:50:25 +0000 (20:50 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 30 Nov 2007 20:50:25 +0000 (20:50 +0000)
commit7ad5931818a2296eb5398e031fa1eb2ea4d0f0db
treefb456d3a01b3d52c3c743e30c43fc9e87d78999e
parentfda022550dc1980ce2d8e255c8699b95432543ed
parent33c40b15a78be31216e1dec07a92d0df643afde5
Merge ... '086f28dc642c28a49acc6fa22f6423d6ba5cef7d'
     and 'd2bef6ae1a0cfb013070a22132d2c8c69fdf19e1'