merge 0.18 branch back into master
authorStefan Behnel <stefan_ml@behnel.de>
Fri, 18 Jan 2013 13:36:58 +0000 (14:36 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Fri, 18 Jan 2013 13:36:58 +0000 (14:36 +0100)

Trivial merge