merge of '561789101197a1ad79583108a323b4d89e6b24a7'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Sep 2006 16:33:35 +0000 (16:33 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Sep 2006 16:33:35 +0000 (16:33 +0000)
commit3802739a380b1dff9e3f15bb54d93daeeee9c70b
treeba63bb12940fc2fb1333bb689f6b45155d794f67
parent72ec3275552754af9ae3ece61c2167259a1d27df
parent174c1295df04a159bf65a74fd2eeb21f5efae25f
Merge ... '561789101197a1ad79583108a323b4d89e6b24a7'
     and '74f8449b82f8cdc938444eddae96bdd31fc4e413'