merge 0.19.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sat, 14 Sep 2013 09:31:16 +0000 (11:31 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Sat, 14 Sep 2013 09:31:16 +0000 (11:31 +0200)

Trivial merge