merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 9 Oct 2013 06:26:01 +0000 (06:26 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 9 Oct 2013 06:26:01 +0000 (06:26 +0000)

Trivial merge