copy 2.5.0 code from Google Code (SVN)