c2e1263462
which included commits to RCS files with non-trunk default branches. svn path=/trunk/; revision=1880
which included commits to RCS files with non-trunk default branches. svn path=/trunk/; revision=1880