Merge remote-tracking branch 'gravitystorm/icons' into staging
authorRichard Fairhurst <richard@systemeD.net>
Sat, 2 Apr 2011 16:45:03 +0000 (17:45 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Sat, 2 Apr 2011 16:45:03 +0000 (17:45 +0100)

Trivial merge