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)
commit404dacd803de72e354429ca559f1ba54e0464f83
treebdb46672b2543cc382d872f4175c3f2b1ccb8752
parent04ee4194bebb609f0d05b47191290c54a5bdc0de
parentd0723775f3313b68d0f7e9481acb1f1d7678fac8
fix conflict