merge 0.18.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Wed, 30 Jan 2013 07:04:45 +0000 (08:04 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Wed, 30 Jan 2013 07:04:45 +0000 (08:04 +0100)

Trivial merge