merge 0.18.x branch back into master
authorStefan Behnel <stefan_ml@behnel.de>
Mon, 21 Jan 2013 07:42:57 +0000 (08:42 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Mon, 21 Jan 2013 07:42:57 +0000 (08:42 +0100)

Trivial merge