merge 0.18.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sun, 27 Jan 2013 05:16:47 +0000 (06:16 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Sun, 27 Jan 2013 05:16:47 +0000 (06:16 +0100)

Trivial merge