commit fbcd5efc9b43a470c53566613b354e2ea7abb754
Merge: feeafb2 10ab28f
Author: Graham Percival <graham@percival-music.ca>
Date:   Thu Nov 10 12:00:04 2011 +0000

    Merge remote branch 'origin' into release/unstable

