merge of '8b3f99cac7b433e63ebc902c06ae99fbf39205c7'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 18 Dec 2006 17:16:54 +0000 (17:16 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 18 Dec 2006 17:16:54 +0000 (17:16 +0000)
     and '9d4c63819084cf385a16232369e7d698fcb6dd87'


Trivial merge