merge of '2462bf8357f02f49aead6eafa119456a9e8c8b91'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 15 Jan 2008 16:19:27 +0000 (16:19 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 15 Jan 2008 16:19:27 +0000 (16:19 +0000)
commit19caf6f39de244f65859fc3759e76ff1c333f78b
tree7c0bfd9e3dc8f518d9b2d544e31e58be1936fe30
parent5edeb4d6b42364adbf7e6ffd18dfbd9e324e474d
parent96bfc4d951c2740e12630acbb52bb9d05acba695
Merge ... '2462bf8357f02f49aead6eafa119456a9e8c8b91'
     and '39f8c0faee1780e683399b25e5ca28f88f9e83ab'