From: Joakim Verona <joakim@verona.se>
Date: Fri, 23 Aug 2013 07:06:30 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2746
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=46ed8fdec3e2cf1f1dbb583a6ff22e27f6941ee4;p=emacs.git

merge from trunk
---

46ed8fdec3e2cf1f1dbb583a6ff22e27f6941ee4