merge of 'd39fcbb20e8ed63ddeb563f8bcffc41b528163cd'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 14 Jul 2008 11:20:50 +0000 (11:20 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 14 Jul 2008 11:20:50 +0000 (11:20 +0000)
commit4fa9f2080e8d8fd8220976415b2bd7bde3ccc620
treeee97d97d541aa249e9c3a839b7418af7053fec26
parent4afec386e30fba9df25eaa0457c1e3c20f5ca974
parent31775c318bdd3b8f62d281aa84e7ad166b78aa79
Merge ... 'd39fcbb20e8ed63ddeb563f8bcffc41b528163cd'
     and 'dff33d19f55f5e1289901a814a5e358b4a4a9981'