We can build now.

svn path=/trunk/; revision=3825