diff -r 973560f0387d -r c129c592e9d6 make/templates/gpl-cp-header
--- a/make/templates/gpl-cp-header	Wed Sep 08 17:29:34 2010 -0700
+++ b/make/templates/gpl-cp-header	Thu Sep 09 17:08:42 2010 -0700
@@ -17,6 +17,6 @@
 2 along with this work; if not, write to the Free Software Foundation,
 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.