Fix up whiteout/blacklist schema - add forgotten <whiteout><blacklist> elements, ignore ordering

comps.rng

@@ -22,8 +22,10 @@
         <ref name="category"/>
       </zeroOrMore>
       <optional>
+        <interleave><!-- We don't care what order these are in -->
           <ref name="whiteout"/>
           <ref name="blacklist"/>
+        </interleave>
       </optional>
     </element>
   </define>
@@ -180,6 +182,7 @@
     'hal.i386' causes anaconda to remove the (now-unneeded) hal.i386, 
     which gives us the desired outcome.
     </a:documentation>
+    <element name="blacklist">
       <zeroOrMore>
         <element name="package">
           <attribute name="name">
@@ -198,6 +201,7 @@
           </optional>
         </element>
       </zeroOrMore>
+    </element>
   </define>
   <define name="whiteout">
     <a:documentation>
@@ -213,6 +217,7 @@
     form 'package>requires', and the RPM macro '_dependency_whiteout' should be
     filled with a (newline-separated) list of these items.
     </a:documentation>
+    <element name="whiteout">
       <zeroOrMore>
         <element name="ignoredep">
           <attribute name="package">
@@ -223,6 +228,7 @@
           </attribute>
         </element>
       </zeroOrMore>
+    </element>
   </define>
   <define name="boolean">
     <choice>