Brian Carlstrom 74b58fc58b Fix linux 64 build
git cherry-pick -e 49416bc658e37a0f4ae4f2b7b8582dd1606fba0f

Change-Id: I37a689acea8aeb5d6ac92ee56b077bafe4fba170
2010-08-24 20:20:50 -07:00
..
2010-08-24 20:20:50 -07:00
2009-03-03 19:31:44 -08:00
2009-03-03 19:31:44 -08:00