From: Bill Wohler <wohler@newt.com>
Date: Sat, 2 Mar 2013 22:55:12 +0000 (-0800)
Subject: Merge from trunk; up to 2013-03-02T21:05:52Z!eggert@cs.ucla.edu.
X-Git-Tag: emacs-24.3.90~173^2~6
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aef2281c76c1a6ec9cb988b8c339a1ed569f1114;p=emacs.git

Merge from trunk; up to 2013-03-02T21:05:52Z!eggert@cs.ucla.edu.
---

aef2281c76c1a6ec9cb988b8c339a1ed569f1114