commit 273e6b790c915192dc71bbc2ba1c077b98034468
Merge: 7186f20 acb4ce2
Author: Graham Percival <graham@percival-music.ca>
Date:   Sun Mar 4 23:37:18 2012 +0000

    Merge remote branch 'origin' into release/unstable

