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

merge from trunk
---

b657a571a916b158914f2a1e8bd8a5f1e7fa2872