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

merge from trunk
---

8fe38b48844fa20976d28f4d21f03796c06c6ce4