# HG changeset patch
# User prr
# Date 1429133307 25200
# Node ID 3dd8906fac2cd5c81f007d2e360aeb2c261f9867
# Parent  9ca7f93d1c5fab2576bd7cec23e901f1520ab12a# Parent  cf5c9dbfcb647a75fb861e586e58ce3de2cbeb36
Merge

diff -r 9ca7f93d1c5f -r 3dd8906fac2c modules.xml
--- a/modules.xml	Tue Apr 14 12:10:00 2015 -0700
+++ b/modules.xml	Wed Apr 15 14:28:27 2015 -0700
@@ -248,18 +248,24 @@
       <to>java.logging</to>
       <to>java.management</to>
       <to>java.naming</to>
+      <to>java.prefs</to>
       <to>java.rmi</to>
       <to>java.security.jgss</to>
       <to>java.security.sasl</to>
       <to>java.sql</to>
+      <to>java.xml</to>
+      <to>java.xml.ws</to>
       <to>jdk.charsets</to>
+      <to>jdk.crypto.pkcs11</to>
       <to>jdk.deploy.osx</to>
+      <to>jdk.httpserver</to>
       <to>jdk.jartool</to>
       <to>jdk.jconsole</to>
       <to>jdk.jvmstat</to>
       <to>jdk.pack200</to>
       <to>jdk.security.auth</to>
       <to>jdk.security.jgss</to>
+      <to>jdk.snmp</to>
     </export>
     <export>
       <name>sun.net.dns</name>