From: Joakim Verona <joakim@verona.se>
Date: Tue, 13 Aug 2013 15:41:40 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2850
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cc446d1a2479b155892fc03f58ff433e46a680fa;p=emacs.git

merge from trunk
---

cc446d1a2479b155892fc03f58ff433e46a680fa