merge branch 0.19.x
authorStefan Behnel <stefan_ml@behnel.de>
Thu, 18 Jul 2013 04:11:17 +0000 (06:11 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Thu, 18 Jul 2013 04:11:17 +0000 (06:11 +0200)

Trivial merge