# HG changeset patch
# User Chris Cannam
# Date 1403095321 -3600
# Node ID f960d67ce84237be28902f24d5c757a72dc8004b
# Parent  3efc20c59a947a137ed7fc715b2a3b0de6c02200# Parent  a8f3195b0761c446ed4726e942be8228870f965e
Merge from branch warnfix_no_size_t