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

merge from trunk
---

3b40cbcb9afa0d38b3627d85db3aa027cce8e26b