v2, v3, integration branch

svn path=/branches/filesystem3/bootstrap.sh; revision=62649