Merge branch 'develop' into release

Conflicts:
	org.tizen.nativeplatform/plugin.xml
	org.tizen.nativeplatform/src/org/tizen/nativeplatform/build/PlatformProjectDependentPackager.java
	org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/RPMPackageCommander.java
	org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/ui/BuildSystemTab.java
	org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/ui/RPMPackageDialog.java
	org.tizen.nativeplatform/src/org/tizen/nativeplatform/preferences/ui/proxy/HttpProxyUtil.java
	org.tizen.nativeplatform/src/org/tizen/nativeplatform/preferences/ui/proxy/ProxyConfDialog.java
	package/changelog
	package/pkginfo.manifest

diff --cc package/changelog
index 506d346,398d4a3..670ea46
--- 1/package/changelog
--- 2/package/changelog
+++ b/package/changelog
@@@ -1,12 -1,24 +1,39 @@@
++<<<<<<< HEAD
 +* 1.0.27
 +- Hide preference page for git config and added filter for proxy port
 +== donghyuk.yang <donghyuk.yang@samsung.com> 2012-11-03
 +* 1.0.26
 +- Rollback status of package manager before latest merging
 +== donghyuk.yang <donghyuk.yang@samsung.com> 2012-11-03
 +* 1.0.25
 +- Merged latest changes
 +== kh5325.kim <kh5325.kim@samsung.com> 2012-11-02
 +* 1.0.24
 +- Added dis upgrade feature to package manager
 +== donghyuk.yang <donghyuk.yang@samsung.com> 2011-10-23
++=======
+ * 1.0.25
+ - Fixed a bug that project from git is not working when using schema in
+ base uri
+ - Check a mismatch architecture between rootstrap and configuration when
+ selecting rootstrap
+ - Changed base directory of user rootstraps to "~/tizen-sdk-data"
+ - Removed double quotation marks from wizard title and description
+ = donghyuk.yang <donghyuk.yang@samsung.com> 2012-11-23
+ * 1.0.24
+ - Modified method for passing environment variables to command launcher
+ == donghyuk.yang <donghyuk.yang@samsung.com> 2012-11-22
+ * 1.0.23
+ - Added question dialog if rootstrap is not initialized
+ - Do not pass rootstrap name and arch arguments to sbi action script
+ == donghyuk.yang <donghyuk.yang@samsung.com> 2012-11-21
+ * 1.0.22
+ - Release for test
+ == donghee.yang <donghee.yang@samsung.com> 2012-11-21
+ * 1.0.21
+ - Applied new Platfrom SDK concept
+ == ho.namkoong <ho.namkoong@samsung.com> 2012-11-15 15:39
+ * 1.0.20
+ - Create fundamental folder when creating native project
+ == ho.namkoong <ho.namkoong@samsung.com> 2012-11-15 15:39
++>>>>>>> develop

diff --cc package/pkginfo.manifest
index 3c6a823,a083641..55acd7a
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +Version:1.0.27
++=======
+ Version:1.0.25
++>>>>>>> develop
  Source:nativeplatform-eplugin
  Maintainer:Kangho Kim <kh5325.kim@samsung.com>, Yoonki Park<yoonki.park@samsung.com>, Hyunsik Noh<hyunsik.noh@samsung.com>, Gun Kim<gune.kim@samsung.com>, Ho Namkoong<ho.namkoong@samsung.com>, Taeyoung Son<taeyoung2.son@samsung.com>