#2 fixed
Merge branch '2_svn_diff'