svn - Revision 8058: /tags/before_3.0_split