Merge branch 'master' of ssh://69.25.196.28:822/srv/git/moonshot-ui
authorSam Thursfield <samthursfield@codethink.co.uk>
Mon, 4 Jul 2011 12:57:17 +0000 (13:57 +0100)
committerSam Thursfield <samthursfield@codethink.co.uk>
Mon, 4 Jul 2011 12:57:17 +0000 (13:57 +0100)

Trivial merge