Merge remote branch 'shadowcat/less_fugly_uris' into less_fugly_uris
Dan Brook [Wed, 10 Feb 2010 15:15:24 +0000 (15:15 +0000)]

Trivial merge