From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 23 Apr 2013 17:01:56 +0000 (+0300)
Subject: Merge from trunk.
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/2dcc73bca70096848e4f51530f8084973c19f530

Merge from trunk.
---

2dcc73bca70096848e4f51530f8084973c19f530