final commit from google code SVN