commit 4cadb44485b704de34192cfdd9ed9fbb4dfa0dee
Merge: e6b5dc4 1141320
Author: Graham Percival <graham@percival-music.ca>
Date:   Sat Oct 8 15:43:54 2011 +0100

    Merge remote branch 'origin' into release/unstable

