From: Joakim Verona <joakim@verona.se>
Date: Thu, 19 Aug 2010 07:34:21 +0000 (+0200)
Subject: upstream merge
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~511^2~29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=96fa1768839e3a9aa5ab5f2b782cea376460df9d;p=emacs.git

upstream merge
---

96fa1768839e3a9aa5ab5f2b782cea376460df9d