commit dcfcbd379ad43840e3b3931974c32e1a2fd898c1
Merge: 241220d 65ed062
Author: Graham Percival <graham@percival-music.ca>
Date:   Wed Jun 6 03:39:06 2012 +0100

    Merge remote branch 'origin' into HEAD

