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

merge from trunk
---

ebc2ba4f6049d17fd41d2f1fc8d65efe309f6bf4