Merge branch 'master' of ssh://69.25.196.28:822/srv/git/moonshot-ui
authorSam Thursfield <samthursfield@codethink.co.uk>
Thu, 7 Jul 2011 10:43:07 +0000 (11:43 +0100)
committerSam Thursfield <samthursfield@codethink.co.uk>
Thu, 7 Jul 2011 10:43:07 +0000 (11:43 +0100)

Trivial merge