commit f3b3c671b744a9b8be0ad969c38b563fd20ebee1
Merge: d5d7273 7583cd4
Author: Graham Percival <graham@percival-music.ca>
Date:   Tue Mar 1 16:07:02 2011 +0000

    Merge branch 'master' into release/unstable

