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

matthew_swift

26.21.2007 5ceb2e9601d2501d021d0c61188ec913076555a0

 opends/src/admin/defn/org/opends/server/admin/std/ApproximateMatchingRuleConfiguration.xml

@@ -40,7 +40,6 @@

  <adm:profile name="ldap">
    <ldap:object-class>
      <ldap:oid>1.3.6.1.4.1.26027.1.2.30</ldap:oid>
      <ldap:name>ds-cfg-approximate-matching-rule</ldap:name>
      <ldap:superior>ds-cfg-matching-rule</ldap:superior>
    </ldap:object-class>