# HG changeset patch
# User Chris Cannam
# Date 1399472278 -3600
# Node ID a589d2201a0c1e4ff4f511d0e3a783339ae1240b
# Parent  65499032086787a2e637131d7225f613c61e7f7b# Parent  dcfc40fc896e290b0040642662a0e9fd12333825
Merge from 900:dcfc40fc896e