Use the correct version of cpe-language_2.3.xsd (don't know how there could be different ones!) and added cpe-naming back in since cpe-language uses it.
Authored by: jimwinston 2011-12-28
Parent: [r1072]
Child: [r1074]