# HG changeset patch
# User Chris Cannam
# Date 1403095898 -3600
# Node ID dfcc5b355f33005e177317d738031a8515812c4e
# Parent  e7a3fa8f4eec7c85ab80e5b1ddab1e2a60633c2c# Parent  f1cab64363d7e4f18a461caee2e2eb1b4b5dfc77
Merge from branch warnfix_no_size_t