merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 11 Jul 2013 12:29:58 +0000 (12:29 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 11 Jul 2013 12:29:58 +0000 (12:29 +0000)

Trivial merge