am e2f5675c: Fix the build
Jeff Hamilton [Thu, 4 Nov 2010 03:11:32 +0000 (20:11 -0700)]
* commit 'e2f5675cc5bd371e1afdd36463d743123d4e4154':
  Fix the build


Trivial merge