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

merge from trunk
---

a191ef40e2df772664843e1ab908e32fb977b8bb