From: Joakim Verona <joakim@verona.se>
Date: Wed, 14 Aug 2013 04:41:21 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2838
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ce7942f31ff4f4902ef2648020f2b96047b68cda;p=emacs.git

merge from trunk
---

ce7942f31ff4f4902ef2648020f2b96047b68cda