fix conflict
authorthomasv <thomasv@gitorious>
Mon, 7 Jan 2013 12:21:27 +0000 (13:21 +0100)
committerthomasv <thomasv@gitorious>
Mon, 7 Jan 2013 12:21:27 +0000 (13:21 +0100)

Trivial merge