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

Trivial merge