From: Jan Djärv <jan.h.d@swipnet.se>
Date: Fri, 2 Apr 2010 09:45:27 +0000 (+0200)
Subject: Merge from trunk
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~607
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7a5a264fc27bde6870f08ecc5d85eddc36fa0336;p=emacs.git

Merge from trunk
---

7a5a264fc27bde6870f08ecc5d85eddc36fa0336