Everything looks good to me, I think this is ready to go in. Tested-by: Russell Currey <ruscur at russell.cc> I'll leave to Andrew and Daniel to actually review the code though.