commit f36d29f1680a4be37a837e4f8c712de3b1d1b8f5
Merge: 3bbc5ed... 31edc33...
Author: Graham Percival <graham@percival-music.ca>
Date:   Sat Sep 11 19:52:11 2010 +0100

    Merge commit 'origin' into release/unstable

