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

Trivial merge