8/23/2010:

No current significant differences with upstream.  Header files need:

#ifdef __cplusplus
extern "C" {
#endif

and

#ifdef __cplusplus
};
#endif

