commit b1376f46a6a4a64b8a919151a716d7adc7423abe
Merge: d4ab9e3... 7e4e125...
Author: Graham Percival <graham@percival-music.ca>
Date:   Thu Feb 4 15:38:50 2010 +0000

    Merge commit 'origin' into release/unstable

