merge of '3a9f43520bacb1650499c5107b1b975b193d30a1'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 10 Feb 2008 22:56:45 +0000 (22:56 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 10 Feb 2008 22:56:45 +0000 (22:56 +0000)
commit9ad4dcb97241e42738eda7bf80c97c31ec55a877
treedd80c65be41322cdd25832335ca6bd0328f72dc7
parenteb3d363570ffbd747787f75104f303a08299dde7
parent7117809d3b752b53a273ee3579b28f249b5fa3ee
Merge ... '3a9f43520bacb1650499c5107b1b975b193d30a1'
     and '62f0b94fbf774e8334ef6abaa6f10437a6818b68'