am 36718f2a: Merge "Fix tests running on the server."
Xavier Ducrohet [Thu, 7 Feb 2013 01:00:50 +0000 (17:00 -0800)]
# Via Gerrit Code Review (1) and Xavier Ducrohet (1)
* commit '36718f2a33f8bf0976cd23999a38dc9234fd671f':
  Fix tests running on the server.


Trivial merge