Commit 2966d3603259430800cb5880491d28a1c5ea2314

Behdad Esfahbod 2013-05-28T17:34:37

Fix test build