From: Joakim Verona <joakim@verona.se>
Date: Wed, 18 Aug 2010 11:11:01 +0000 (+0200)
Subject: merge from trunk, no conflicts
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~511^2~32
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=432c97542003050bab643a8f901feaa326f8369f;p=emacs.git

merge from trunk, no conflicts
---

432c97542003050bab643a8f901feaa326f8369f