# HG changeset patch
# User Chris Cannam
# Date 1403095887 -3600
# Node ID c4ef666721bf7c5f1174e700736e1a84dea8a224
# Parent  ddae586bc47bbe718d625109065b06d11d23db8a# Parent  40c6c9344ff6af5642ceaf288b1e07afa0e9b23d
Merge from branch warnfix_no_size_t