merge 0.17 branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Wed, 28 Nov 2012 20:27:18 +0000 (21:27 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Wed, 28 Nov 2012 20:27:18 +0000 (21:27 +0100)

Trivial merge