commit e6f638c8c580606d38ebd5f8df4d0ea7558f1137
Merge: 814fc3e 7b99926
Author: Graham Percival <graham@percival-music.ca>
Date:   Wed Jul 4 17:41:03 2012 +0100

    Merge remote-tracking branch 'origin' into HEAD

