commit 0c71ac4a0b898f9b9b615f826f3211b8e60c35b0
Merge: e51e768... 0c518bd...
Author: Graham Percival <graham@percival-music.ca>
Date:   Tue Jul 6 12:19:51 2010 +0100

    Merge commit 'origin' into release/unstable

