(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
svn path=/trunk/; revision=23339