diff -r 3d9b2d67f71f -r 387a4dd51adf langtools/src/share/classes/com/sun/tools/javac/resources/javac.properties
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/javac.properties	Fri Aug 09 15:01:33 2013 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/javac.properties	Sat Aug 10 13:27:38 2013 +0100
@@ -185,6 +185,8 @@
      key in annotation processor option ''{0}'' is not a dot-separated sequence of identifiers
 javac.err.invalid.flag=\
     invalid flag: {0}
+javac.err.profile.bootclasspath.conflict=\
+    profile and bootclasspath options cannot be used together
 javac.err.invalid.profile=\
     invalid profile: {0}
 javac.err.invalid.target=\