am 52d880da: Really fix the build.
Jeff Hamilton [Thu, 4 Nov 2010 03:11:41 +0000 (20:11 -0700)]
* commit '52d880daa43a4f587107a6b8a0197afd3092200a':
  Really fix the build.


Trivial merge