Merge branch 'de' into at
authorAndreas Scherbaum <andreas@scherbaum.biz>
Tue, 14 Sep 2010 07:52:55 +0000 (09:52 +0200)
committerAndreas Scherbaum <andreas@scherbaum.biz>
Tue, 14 Sep 2010 07:52:55 +0000 (09:52 +0200)

Trivial merge