On the 1.9-cache-improvements branch: Merge r1679859 from the 1.10-cache-improvements branch and resolve text conflicts.  Update the combine_key function, see below.
On the 1.9-cache-improvements branch:
Merge r1679859 from the 1.10-cache-improvements branch and resolve
text conflicts.  Update the combine_key function, see below.

* subversion/libsvn_subr/cache-membuffer.c
  (combine_key): As in combine_long_key, use size_t with key lengths
                 and remove the obsolete key length limiter code.

git-svn-id: 55fce1777d54e23d563e29785a1eeb58fd1b6a55@1679862 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion