merge of 2694ea866aead6f6639b0c69c13127c90f95e5ff
authorMichael Lauer <mickey@vanille-media.de>
Wed, 23 Aug 2006 19:22:52 +0000 (19:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 23 Aug 2006 19:22:52 +0000 (19:22 +0000)
commit68be6099dd326f7e48422cf3cacab6433b360260
treeb8b37a1bf6e094fc401ef5ad1df79bcba8b2d250
parent75470578abf41b1632fb7f6f8afac646f438b82f
parent488bf9ffaebb63ff512f09129791988ba5a1edfd
merge of 2694ea866aead6f6639b0c69c13127c90f95e5ff
     and c02b3cdfadfa7f433fd5ca7a0ffcb6f329cadbaf