svn path=/trunk/; revision=16022
svn path=/trunk/; revision=15973
Part 1: the dictionary svn path=/trunk/; revision=14924