# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1382367441 -28800
# Node ID 33207ed1174b704998c60f49fdd7ab5ee0a9ed67
# Parent  e378da7eae5d86af73c5396653fe223794b5d0fc# Parent  4095b6d7c9fce985fe87d2d8cde0c77fe0caec37
Merge in ECC