Merge from trunk

svn path=/branches/bcbboost/tools/bcp/; revision=49171