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

merge from trunk
---

45acbe613b0448d0f6ee6254b6c48191ab380fc4