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

merge from trunk
---

0c405d30ab1e3464cf3e03547db939fad0a765d0