This commit was manufactured by cvs2svn to create branch 'RC_1_30_0'.

[SVN r17693]
Update Borland C++ version number in enable_if check


[SVN r19176]
VC 7.1 does not handle the operator== conversions correctly, either


[SVN r19177]
Stupid fix, from mainline


[SVN r19490]