merged from trunk

svn path=/branches/proto/v4/tools/bcp/; revision=49607