Resync from google code