merge
authorkristianf <devnull@localhost>
Sun, 6 Oct 2013 18:55:34 +0000 (20:55 +0200)
committerkristianf <devnull@localhost>
Sun, 6 Oct 2013 18:55:34 +0000 (20:55 +0200)

Trivial merge