# HG changeset patch
# User Chris Cannam
# Date 1403095876 -3600
# Node ID 0c1d6de8f44bc158bcb55866874602bcb912e2cf
# Parent  49618f39ff091e72eb94dd0d8424da44cf10e272# Parent  a8f3195b0761c446ed4726e942be8228870f965e
Merge from branch warnfix_no_size_t