From 1366d9252c2a4963a30735c2a7110607a3935b2d Mon Sep 17 00:00:00 2001
From: Jinkun Jang <jinkun.jang@samsung.com>
Date: Sat, 16 Mar 2013 01:12:05 +0900
Subject: [PATCH] merge with master

---
 AUTHORS | 4 ++--
 NOTICE  | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 100644 NOTICE

diff --git a/AUTHORS b/AUTHORS
index 68b49ae..b01c60f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,2 @@
-Kangho Hur <kanho.hur at samsung dot com>
-Seungkeun Lee <sngn.lee at samsung dot com>
+Kangho Hur <kanho.hur@samsung.com>
+Seungkeun Lee <sngn.lee@samsung.com>
diff --git a/NOTICE b/NOTICE
deleted file mode 100644
index ccdad52..0000000
--- a/NOTICE
+++ /dev/null
@@ -1,3 +0,0 @@
-Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Apache License, Version 2.
-Please, see the LICENSE file for Apache License terms and conditions.
-- 
2.7.4