merge
authorStefan Behnel <stefan_ml@behnel.de>
Fri, 15 Nov 2013 20:41:12 +0000 (21:41 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Fri, 15 Nov 2013 20:41:12 +0000 (21:41 +0100)

Trivial merge