Merge branch 'master' into icons2
authorAndy Allan <andy@gravitystorm.co.uk>
Sun, 3 Apr 2011 13:39:09 +0000 (14:39 +0100)
committerAndy Allan <andy@gravitystorm.co.uk>
Sun, 3 Apr 2011 13:39:09 +0000 (14:39 +0100)

Trivial merge