From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 16 Apr 2012 01:22:25 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/fda8c8fa718a63e4f8106ed628978fed72837c13

Merge from trunk.
---

fda8c8fa718a63e4f8106ed628978fed72837c13