merged 0.17 branch back into master
authorStefan Behnel <stefan_ml@behnel.de>
Wed, 26 Sep 2012 17:18:31 +0000 (19:18 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Wed, 26 Sep 2012 17:18:31 +0000 (19:18 +0200)

Trivial merge