commit b345ee2e69d63455d2ba154f6040771620341133
Merge: 61fd262 91ff754
Author: Graham Percival <graham@percival-music.ca>
Date:   Sun Jun 19 10:28:44 2011 +0100

    Merge remote branch 'origin' into release/unstable

