commit b35f0e3fd58bc402dd29254074500eeb264c5fbf
Merge: 3fcde91... bb65085...
Author: Graham Percival <graham@percival-music.ca>
Date:   Sat Feb 13 18:09:29 2010 +0000

    Merge commit 'origin' into release/unstable

