From: Bill Wohler <wohler@newt.com>
Date: Mon, 4 Jul 2011 02:58:14 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~206
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ca74e5368a1022e332a0601d9be2418dbe8c083;p=emacs.git

Merge from trunk.
---

3ca74e5368a1022e332a0601d9be2418dbe8c083