Merge "Fix tests running on the server."
Xavier Ducrohet [Thu, 7 Feb 2013 00:46:51 +0000 (00:46 +0000)]

Trivial merge