From: Joakim Verona <joakim@verona.se>
Date: Fri, 20 Aug 2010 20:00:00 +0000 (+0200)
Subject: merge from upstream
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~511^2~27
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=38f9163d622c5024a75775ce1a2fc9e99e4bd9cb;p=emacs.git

merge from upstream
---

38f9163d622c5024a75775ce1a2fc9e99e4bd9cb