Merging from trunk

svn path=/branches/release/tools/bcp/; revision=84745