merge
authorpravin@inf.ethz.ch <pravin@inf.ethz.ch>
Mon, 9 Dec 2013 13:19:31 +0000 (14:19 +0100)
committerpravin@inf.ethz.ch <pravin@inf.ethz.ch>
Mon, 9 Dec 2013 13:19:31 +0000 (14:19 +0100)

Trivial merge