Merge branch 'master' of http://www.project-moonshot.org/git/moonshot-ui
authorPete Fotheringham <pete.fotheringham@codethink.co.uk>
Fri, 13 Jan 2012 14:06:25 +0000 (14:06 +0000)
committerPete Fotheringham <pete.fotheringham@codethink.co.uk>
Fri, 13 Jan 2012 14:06:25 +0000 (14:06 +0000)

Trivial merge