v2, v3, integration branch

svn path=/branches/filesystem3/boost.png; revision=62649