diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog
index 860ce218b1..45d793e664 100644
--- a/legacy/evas/ChangeLog
+++ b/legacy/evas/ChangeLog
@@ -837,3 +837,8 @@
 
         * Fix font instance refcounting for textprops that hang around.
 
+2012-06-29  Jiyoun Park
+
+	* upstream merge
+	* Merge remote-tracking branch 'remotes/origin/upstream'
+