Merge branch 'ch' into de
authorAndreas Scherbaum <andreas@scherbaum.biz>
Mon, 13 Sep 2010 22:34:06 +0000 (00:34 +0200)
committerAndreas Scherbaum <andreas@scherbaum.biz>
Mon, 13 Sep 2010 22:34:06 +0000 (00:34 +0200)

Trivial merge