# HG changeset patch
# User Chris Cannam
# Date 1403095713 -3600
# Node ID f0b210403369fbca2b3cfa6e7ac62d820ea8a153
# Parent  d511868c1ffe8b455d7c78fcfed46b49840dac26# Parent  0f72797ecdefdaf768209f8aa77bf708a385124a
Merge from branch warnfix_no_size_t