copy 2.1.0 code from Google Code (SVN)