merge with master

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 (file)
--- 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.