original patch by jake@bugzilla.org, merged to current sources by
bbaetz@student.usyd.edu.au
r=gerv, justdave