General support for XCA:
----------------------------------
Mark Foster <mark@foster.cc>
