First pass at schema and import changes to support SCAP 1.2
In support of feature request 3427004.
Authored by: jimwinston 2011-10-21
Parent: [r1048]
Child: [r1050]