merge branch 0.19.x
authorStefan Behnel <stefan_ml@behnel.de>
Wed, 17 Jul 2013 19:24:37 +0000 (21:24 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Wed, 17 Jul 2013 19:24:37 +0000 (21:24 +0200)

Trivial merge