From: Joakim Verona <joakim@verona.se>
Date: Fri, 16 Aug 2013 08:42:10 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2799
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1ac42cc43738e69ea75933b9801cdb194f6e37c7;p=emacs.git

merge from trunk
---

1ac42cc43738e69ea75933b9801cdb194f6e37c7