v2, v3, integration branch

svn path=/branches/filesystem3/status/; revision=62649