commit f7278543a3ca65ee239696c21b4a8d0155bb79db
Merge: 3345456 21c7a8b
Author: Graham Percival <graham@percival-music.ca>
Date:   Tue Sep 6 09:19:56 2011 +0100

    Merge remote branch 'origin' into release/unstable

