v2, v3, integration branch

svn path=/branches/filesystem3/index.htm; revision=62649