sf patch #1644019, from good ol' Ka-Hing Cheung

2007-01-25, Mark Doliner