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

merge from trunk
---

43ee61f2e70c79ab2ac51893890614f0c8874e2f