From: Joakim Verona <joakim@verona.se>
Date: Sat, 3 Apr 2010 20:21:58 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~511^2~56
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=245e223a57ac14d168702891f6efbe0eb11b0384;p=emacs.git

merge from trunk
---

245e223a57ac14d168702891f6efbe0eb11b0384