Merge remote-tracking branch 'gravitystorm/icons2'
authorRichard Fairhurst <richard@systemeD.net>
Sun, 22 May 2011 14:46:46 +0000 (15:46 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Sun, 22 May 2011 14:46:46 +0000 (15:46 +0100)

Trivial merge