From: Joakim Verona <joakim@verona.se>
Date: Mon, 26 Aug 2013 16:42:27 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2718
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=789fc3346ed7f2e8a2c3ba09502bce59893f1167;p=emacs.git

merge from trunk
---

789fc3346ed7f2e8a2c3ba09502bce59893f1167