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

Trivial merge