merge of 'cdaf3702bfeaebdf9d1466a398935ab179583c9a'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 2 Dec 2007 16:05:32 +0000 (16:05 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 2 Dec 2007 16:05:32 +0000 (16:05 +0000)
commit282088f1ad999b8427ad8acf43021538388afa60
tree3e0564475209464a8c8ea73930e74fdef7d6e1ad
parent540a1c1e47ffaf5fff8788d039ea32c0b1c5e4e8
parent76690a09c46fc3214e2f0e3daab4ba1c55f52a0e
Merge ... 'cdaf3702bfeaebdf9d1466a398935ab179583c9a'
     and 'd045039e1aba07c5bb52c9acf9236d6bb0cf1831'