# HG changeset patch
# User Chris Cannam
# Date 1527179402 -3600
# Node ID da678ff18fb05e72ce80ab0e1023673944893242
# Parent  c187a791fd46de4ee1ac45e23492b5b4513a98c7# Parent  a2053d1fb6be7dfcb2ecd5440d4457ef92d39369
Merge from branch baselib-win-build