From: Joakim Verona <joakim@verona.se>
Date: Thu, 15 Aug 2013 08:41:34 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2822
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=df97ebce4976f5ddb1faf8328f8e249d117f03bc;p=emacs.git

merge from trunk
---

df97ebce4976f5ddb1faf8328f8e249d117f03bc