Merge ASN1 branch to trunk

matthew_swift

05.42.2009 35c5f651a0c5c658a4bc67614e815405fcc6a830

 opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java

@@ -635,7 +635,7 @@
          indexEntry.getObjectClassAttribute().iterator();
        while (it.hasNext())
        {
          oc.add(it.next().getStringValue());
          oc.add(it.next().getValue().toString());
        }
        attrs.put(oc);

@@ -647,7 +647,7 @@
          it = odsAttr.iterator();
          while (it.hasNext())
          {
            attr.add(it.next().getStringValue());
            attr.add(it.next().getValue().toString());
          }
          attrs.put(attr);
        }