Changes from 2.1a to 2.1b
===========================================================

Okay, the patch from 2.1a to 2.1b is tiny (most of it is probably this file).

Basically, it makes the source compile on 2.4.0-test10 (which should cover
everything from 1.3.17).
