From: Joakim Verona <joakim@verona.se>
Date: Wed, 11 Sep 2013 08:37:10 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2691
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9bdba396e40b4461b78d3fbf8620d6b61004bf39;p=emacs.git

merge from trunk
---

9bdba396e40b4461b78d3fbf8620d6b61004bf39