merge
authorkristianf <devnull@localhost>
Mon, 30 Sep 2013 18:53:00 +0000 (20:53 +0200)
committerkristianf <devnull@localhost>
Mon, 30 Sep 2013 18:53:00 +0000 (20:53 +0200)

Trivial merge