From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 26 Oct 2011 07:31:15 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.2.90~471^2~6^2~135
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c03500e05a53e1717a7cd659bbe085014507eadd;p=emacs.git

Merge from trunk.
---

c03500e05a53e1717a7cd659bbe085014507eadd