Merge branch 'at' into de
authorAndreas Scherbaum <[email protected]>
Sun, 12 Sep 2010 23:23:51 +0000 (01:23 +0200)
committerAndreas Scherbaum <[email protected]>
Sun, 12 Sep 2010 23:23:51 +0000 (01:23 +0200)

Trivial merge