Merge branch 'master' into roles-saner
Tomas Doran (t0m) [Sat, 25 Jul 2009 10:26:44 +0000 (11:26 +0100)]

Trivial merge