Merge branches/temp-admin@3208 onto trunk@3208.

matthew_swift

26.21.2007 5ceb2e9601d2501d021d0c61188ec913076555a0

 opends/resource/admin/admin.xsd

@@ -1157,15 +1157,6 @@
          </xsd:sequence>
        </xsd:complexType>
      </xsd:element>
      <xsd:element name="oid">
        <xsd:annotation>
          <xsd:documentation>
            Used for properties which contain LDAP object identifiers
            (e.g. attribute names, object classes, controls, etc).
          </xsd:documentation>
        </xsd:annotation>
        <xsd:complexType />
      </xsd:element>
      <xsd:element name="aci">
        <xsd:annotation>
          <xsd:documentation>