merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 8 Oct 2013 12:41:32 +0000 (12:41 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 8 Oct 2013 12:41:32 +0000 (12:41 +0000)

Trivial merge