From: Jan Djärv <jan.h.d@swipnet.se>
Date: Fri, 2 Apr 2010 12:06:55 +0000 (+0200)
Subject: Merge from trunk
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=58dbbc2cc42cdac33c6cb72b3c8dc4f1286901d8;p=emacs.git

Merge from trunk
---

58dbbc2cc42cdac33c6cb72b3c8dc4f1286901d8