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

Trivial merge