merge 0.19.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sat, 12 Oct 2013 08:19:18 +0000 (10:19 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Sat, 12 Oct 2013 08:19:18 +0000 (10:19 +0200)

Trivial merge