merge 0.19.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sat, 6 Jul 2013 19:54:58 +0000 (21:54 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Sat, 6 Jul 2013 19:54:58 +0000 (21:54 +0200)

Trivial merge