Merge remote-tracking branch 'origin/master' into carriage-update
authorJoachim Glauche <webmaster@joaz.de>
Fri, 14 Sep 2012 08:58:42 +0000 (10:58 +0200)
committerJoachim Glauche <webmaster@joaz.de>
Fri, 14 Sep 2012 08:58:42 +0000 (10:58 +0200)

Trivial merge