merged 0.17 branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sun, 4 Nov 2012 09:21:11 +0000 (10:21 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Sun, 4 Nov 2012 09:21:11 +0000 (10:21 +0100)

Trivial merge