v2, v3, integration branch

svn path=/branches/filesystem3/libs/functional/factory/; revision=62649