Merge remote branch 'github/less_fugly_uris' into less_fugly_uris
Dan Brook [Mon, 29 Mar 2010 10:16:47 +0000 (11:16 +0100)]

Trivial merge