commit 7129b9a1b73c400593ccc08418b294afef1513a1
Merge: 6eca092 f9af9dd
Author: Graham Percival <graham@percival-music.ca>
Date:   Tue Jul 26 18:42:42 2011 +0100

    Merge remote branch 'origin' into release/unstable

