From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 1 Sep 2011 14:51:44 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~153^2~1^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fd09688b0bbd5ee8011e78a1f4e794603e27232f;p=emacs.git

Merge from trunk.
---

fd09688b0bbd5ee8011e78a1f4e794603e27232f