Merge branch 'refactor' into snapshotserver
authorAndy Allan <andy@gravitystorm.co.uk>
Wed, 15 Jun 2011 14:47:45 +0000 (15:47 +0100)
committerAndy Allan <andy@gravitystorm.co.uk>
Wed, 15 Jun 2011 14:47:45 +0000 (15:47 +0100)

Trivial merge