v2, v3, integration branch

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