From: Joakim Verona <joakim@verona.se>
Date: Fri, 16 Aug 2013 09:56:56 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2798
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4f89fdfb1a480d29b60956f93dfadb3c0fcbff46;p=emacs.git

merge from trunk
---

4f89fdfb1a480d29b60956f93dfadb3c0fcbff46