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

---
 LICENSE.APLv2 => LICENSE | 0
 NOTICE                   | 2 --
 2 files changed, 2 deletions(-)
 rename LICENSE.APLv2 => LICENSE (100%)

diff --git a/LICENSE.APLv2 b/LICENSE
similarity index 100%
rename from LICENSE.APLv2
rename to LICENSE
diff --git a/NOTICE b/NOTICE
index 49acec9..4297ee3 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,3 +1 @@
 Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Apache License, Version 2.
-Please, see the LICENSE.APLv2 file for Apache License, Version 2 terms and conditions.
-- 
2.7.4