From: Joakim Verona <joakim@verona.se>
Date: Thu, 22 Aug 2013 17:47:29 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2751
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ef581ca7da4e9903cad73837cd451fd969adcdbd;p=emacs.git

merge from trunk
---

ef581ca7da4e9903cad73837cd451fd969adcdbd