merge 0.18.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sat, 26 Jan 2013 18:15:39 +0000 (19:15 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Sat, 26 Jan 2013 18:15:39 +0000 (19:15 +0100)

Trivial merge