From: Joakim Verona <joakim@verona.se>
Date: Wed, 14 Aug 2013 16:51:46 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2827
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1cd3338c8c8074c0c93c997e4430d441fdec4113;p=emacs.git

merge from trunk
---

1cd3338c8c8074c0c93c997e4430d441fdec4113