diff --git a/common/CHANGES.txt b/common/CHANGES.txt
index da5f1cb6f2f..c789050c161 100644
--- a/common/CHANGES.txt
+++ b/common/CHANGES.txt
@@ -241,6 +241,10 @@ Trunk (unreleased changes)
 
     HADOOP-7451. Generalize StringUtils#join. (Chris Douglas via mattf)
 
+    HADOOP-7449. Add Data(In,Out)putByteBuffer to work with ByteBuffer similar 
+    to Data(In,Out)putBuffer for byte[].  Merge from yahoo-merge branch,
+    -r 1079163.  Fix missing Apache license headers. (Chris Douglas via mattf)
+
   OPTIMIZATIONS
   
     HADOOP-7333. Performance improvement in PureJavaCrc32. (Eric Caspole
diff --git a/common/src/java/org/apache/hadoop/io/DataInputByteBuffer.java b/common/src/java/org/apache/hadoop/io/DataInputByteBuffer.java
index 98a8e851f4a..469d3ff863c 100644
--- a/common/src/java/org/apache/hadoop/io/DataInputByteBuffer.java
+++ b/common/src/java/org/apache/hadoop/io/DataInputByteBuffer.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.hadoop.io;
 
 import java.io.DataInputStream;
diff --git a/common/src/java/org/apache/hadoop/io/DataOutputByteBuffer.java b/common/src/java/org/apache/hadoop/io/DataOutputByteBuffer.java
index 0d053ab7956..b85f693dfd9 100644
--- a/common/src/java/org/apache/hadoop/io/DataOutputByteBuffer.java
+++ b/common/src/java/org/apache/hadoop/io/DataOutputByteBuffer.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.hadoop.io;
 
 import java.io.DataOutputStream;
diff --git a/common/src/test/core/org/apache/hadoop/io/TestDataByteBuffers.java b/common/src/test/core/org/apache/hadoop/io/TestDataByteBuffers.java
index c2f912051c2..aeaefb6bf94 100644
--- a/common/src/test/core/org/apache/hadoop/io/TestDataByteBuffers.java
+++ b/common/src/test/core/org/apache/hadoop/io/TestDataByteBuffers.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.hadoop.io;
 
 import java.io.DataInput;