From: Joakim Verona <joakim@verona.se>
Date: Tue, 27 Aug 2013 04:06:30 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2711
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9d1c69140689c3efe53e50b01fe5d7f1d020277e;p=emacs.git

merge from trunk
---

9d1c69140689c3efe53e50b01fe5d7f1d020277e