merge 0.18.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Mon, 28 Jan 2013 21:44:28 +0000 (22:44 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Mon, 28 Jan 2013 21:44:28 +0000 (22:44 +0100)

Trivial merge