commit dadca4c6f0595106eec22ae7453d35c24a93eb3a
Merge: 43fe7b5 63b9d01
Author: Graham Percival <graham@percival-music.ca>
Date:   Sat Jul 30 22:22:15 2011 +0100

    Merge remote branch 'origin' into release/unstable

