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

Trivial merge