From: Stephen Berman <stephen.berman@gmx.net>
Date: Fri, 21 Jun 2013 21:40:50 +0000 (+0200)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2014
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f6206a442e3e39f8e0a9d63fbb399a3af03fe765;p=emacs.git

Merge from trunk.
---

f6206a442e3e39f8e0a9d63fbb399a3af03fe765