From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 9 Jul 2012 04:56:32 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.2.90~1199^2~125
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8d16df0eec002109fd5373ea870504f3632219c7;p=emacs.git

Merge from trunk.
---

8d16df0eec002109fd5373ea870504f3632219c7