From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sat, 10 Apr 2010 12:42:15 +0000 (+0200)
Subject: Merge from trunk
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7dd6400ee8fa4c2201d4bcd839755cbb6b6956e9;p=emacs.git

Merge from trunk
---

7dd6400ee8fa4c2201d4bcd839755cbb6b6956e9