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

merge from trunk
---

b27d230fc41cb345855438f18c72dcb74ad488fe