commit 0b3a6d7c6cdad756498bbcc4d3268ec881d66a85
Merge: 8bf39c1... bf3c7cb...
Author: Graham Percival <graham@percival-music.ca>
Date:   Thu Mar 4 16:31:08 2010 +0000

    Merge commit 'origin' into release/unstable

