Contributions since July 2010:
Joris van Rantwijk <jorisvr@sron.nl>: XCFxxP handling