canola (0.8.D013-1~maverick) maverick; urgency=low * This change set fixes a merge bug (the conflict markers were left in). -- Peter Miller <email address hidden> Wed, 25 Jul 2012 09:33:47 +1000