Merge
authorGregor Riegler <gregor.riegler@gmail.com>
Mon, 10 Jun 2013 20:18:41 +0000 (22:18 +0200)
committerGregor Riegler <gregor.riegler@gmail.com>
Mon, 10 Jun 2013 20:18:41 +0000 (22:18 +0200)

Trivial merge