1.0.2beta1: Record-only merge on [11318].


git-svn-id: http://trac.edgewall.org/intertrac/log:/branches/1.0-stable@13119 af82e41b-90c4-0310-8c96-b1721e28e2e2