From: Martin Rudalics <rudalics@gmx.at>
Date: Thu, 14 Apr 2011 09:23:01 +0000 (+0200)
Subject: Merge from trunk
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dda7d5da8f6615d1242b65a242c5d64d2fb710c3;p=emacs.git

Merge from trunk
---

dda7d5da8f6615d1242b65a242c5d64d2fb710c3