Merge remote-tracking branch 'gravitystorm/choices'
authorRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 10:35:13 +0000 (11:35 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 10:35:13 +0000 (11:35 +0100)

Trivial merge