commit 1f42ff8ff4f7b5d5d796643e4680aa3cc0199fdc
Merge: 9c42a66 a4db8e2
Author: Graham Percival <graham@percival-music.ca>
Date:   Fri Jan 28 18:57:43 2011 +0000

    Merge remote branch 'origin' into release/unstable

