changes here. It compiles OK on OS X, but hasn't been tested anywhere else. svn path=/trunk/; revision=18260