merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 19 Nov 2013 14:54:06 +0000 (14:54 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 19 Nov 2013 14:54:06 +0000 (14:54 +0000)

Trivial merge