copy 2.4.0 code from Google Code (SVN)