Merge with the offending files removed.

svn path=/branches/hash/boost/gil/; revision=39995