Merge branch 'master' of git://git.vireo.org/movein
authorStuart Prescott <stuart+debian@nanonanonano.net>
Tue, 11 Oct 2011 16:16:18 +0000 (17:16 +0100)
committerStuart Prescott <stuart+debian@nanonanonano.net>
Tue, 11 Oct 2011 16:16:18 +0000 (17:16 +0100)

Trivial merge