merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Fri, 19 Jul 2013 11:36:59 +0000 (11:36 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Fri, 19 Jul 2013 11:36:59 +0000 (11:36 +0000)

Trivial merge