merge of 'bb80418f92c2db8734eda06db4ea527fdc5c84b0'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 19 Jul 2008 12:08:56 +0000 (12:08 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 19 Jul 2008 12:08:56 +0000 (12:08 +0000)
commit209683be7cf9b41732cee885d046ea97a7978eb2
treef45298617c359b63d50148501b4c2e2eb52b79aa
parentbaaed44305c68ccd1cb927b2c20b0a7e8ed7c002
parentcdf780e925cadc29e9bdb70b6086c1e7ce499105
Merge ... 'bb80418f92c2db8734eda06db4ea527fdc5c84b0'
     and 'f9f4aeef69ea9d929a612c025e1e90a2de52faca'