# HG changeset patch
# User Chris Cannam
# Date 1420475854 0
#      Mon Jan 05 16:37:34 2015 +0000
# Branch win32_mediafoundation
# Node ID 853926dca34d75160d46529ebc44b79396b5fb78
# Parent  4f5981cac12bd94403ca6e70fde062f61a385f18
# Parent  e253adc168edb1ef93b8a344891bcf29ed039c70
Merge from the default branch