merge of '6bf4895c5f2152a0cafda3d402b7b1190cd8469a'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 6 Jul 2007 22:04:41 +0000 (22:04 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 6 Jul 2007 22:04:41 +0000 (22:04 +0000)
     and 'd5b50f42c0a46a86e2e6458ba37bf575cad2f411'


Trivial merge