svn path=/trunk/; revision=14931
svn path=/trunk/; revision=14929
Part 2: the code svn path=/trunk/; revision=14925