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

merge from trunk
---

6c21e9fe3cf487045bdf660e5400e2b9a7d6555f