merge of '2f3182e242be826a1109001af42d7184d320ca4a'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 7 Aug 2007 20:14:09 +0000 (20:14 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 7 Aug 2007 20:14:09 +0000 (20:14 +0000)
commit451b6168bc0df5ace1f62bb55cd8a2c4516e1940
treebd258593262f6bd5ba9097f60316c65428a7238d
parent2c0ccf8938c260f11360d9559544075da1a4693f
parent933172af0a4715960c3a7dd8c716ff2d9c1f4080
Merge ... '2f3182e242be826a1109001af42d7184d320ca4a'
     and 'e609b6a9ff4128a148102c97d991816ec7782504'