For 2.5.x only.  (Patch 1042/1 is for 2.4.x)

(replaces patch 1041/1.)

Christopher Hoover
mailto:ch@murgatroid.com
mailto:ch@hpl.hp.com