commit ace3f541e8dd24463c2e1310fcae983be048ea81
Merge: fa66183 c18a564
Author: Graham Percival <graham@percival-music.ca>
Date:   Tue Oct 25 01:14:52 2011 +0100

    Merge remote branch 'origin' into release/unstable

