merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 23 Jul 2013 11:31:47 +0000 (11:31 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 23 Jul 2013 11:31:47 +0000 (11:31 +0000)

Trivial merge