merge
authorkristianf <devnull@localhost>
Sun, 6 Oct 2013 14:13:21 +0000 (16:13 +0200)
committerkristianf <devnull@localhost>
Sun, 6 Oct 2013 14:13:21 +0000 (16:13 +0200)

Trivial merge