merge
authorStefan Behnel <stefan_ml@behnel.de>
Sun, 11 Aug 2013 07:37:10 +0000 (09:37 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Sun, 11 Aug 2013 07:37:10 +0000 (09:37 +0200)

Trivial merge