commit 802872b615d40beb8064b83763b48e7dcdac2b6f
Merge: 17345fe 9ce0684
Author: Graham Percival <graham@percival-music.ca>
Date:   Tue Feb 22 09:23:06 2011 +0000

    Merge branch 'master' into release/unstable

