Merge branch 'develop' into release

Conflicts:
	org.tizen.common.verrari/templates/jar/common-resources.jar
	org.tizen.common.verrari/templates/jar/jqm-common-resources.jar
	org.tizen.common.verrari/templates/jar/jqm-masterdetail.jar
	org.tizen.common.verrari/templates/jar/jqm-multipage.jar
	org.tizen.common.verrari/templates/jar/jqm-navigation.jar
	org.tizen.common.verrari/templates/jar/jqm-singlepage.jar
	org.tizen.common.verrari/templates/jar/tizen-basic.jar
	org.tizen.common.verrari/templates/jar/tizenwebuifw-common-resources.jar
	org.tizen.common.verrari/templates/jar/tizenwebuifw-masterdetail.jar
	org.tizen.common.verrari/templates/jar/tizenwebuifw-multipage.jar
	org.tizen.common.verrari/templates/jar/tizenwebuifw-navigation.jar
	org.tizen.common.verrari/templates/jar/tizenwebuifw-singlepage.jar
	package/changelog
	package/pkginfo.manifest

diff --cc package/changelog
index b8dbcd2,9ae5397..da703eb
--- 1/package/changelog
--- 2/package/changelog
+++ b/package/changelog
@@@ -1,9 -1,21 +1,12 @@@
 -* 2.0.9
 -- re packaging 2.0.8
 -== hyunsik.noh <hyunsik.noh@samsung.com> 2013-01-23 21:01
 -* 2.0.8
 -- fix invalid character for log file name on windows
 -== hyunsik.noh <hyunsik.noh@samsung.com> 2013-01-23 20:49
 -* 2.0.7
 -- updated tizen web ui fw to 0.2.11
 -== jihoon80.song <jihoon80.song@samsung.com> 2013-01-23 15:58
+ * 2.0.6
 -- updated TizenWebUIFW to 0.2.9
 -== jihoon80.song <jihoon80.song@samsung.com> 2013-01-18 19:34
++- Merged the latest changes
++== kh5325.kim <kh5325.kim@samsung.com> 2013-01-28
  * 2.0.5
 -- sync version
 -== jihoon80.song <jihoon80.song@samsung.com> 2013-01-18 18:19
 +- Merged the latest changes
 +== kh5325.kim <kh5325.kim@samsung.com> 2013-01-19
  * 2.0.4
 -- updated Tizen Web UI FW to 0.2.9
 -== jihoon80.song <jihoon80.song@samsung.com> 2013-01-18 11:46
 +- Fix bug: plain text cannot be used in signing
 +== ho.namkoong <ho.namkoong@samsung.com> 2013-01-15
  * 2.0.3
  - Fix bug: plain text cannot be used in signing
  == ho.namkoong <ho.namkoong@samsung.com> 2013-01-15

diff --cc package/pkginfo.manifest
index d3520b8,cca7b8a..4907b22
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,4 -1,4 +1,4 @@@
- Version:2.0.5
 -Version:2.0.9
++Version:2.0.6
  Source:common-eplugin
  Maintainer:kangho kim <kh5325.kim@samsung.com>, yoonki park <yoonki.park@samsung.com>, hyunsik non <hyunsik.noh@samsung.com>, taeyoung son <taeyoung2.son@samsung.com>, gune Kim <gune.kim@samsung.com>, ho namkoong <ho.namkoong@samsung.com>, hyeongseok heo <hyeong-seok.heo@samsung.com>, gyeongseok seo <gyeongseok.seo@samsung.com>, jihoon song <jihoon80.song@samsung.com>, changhyun lee <changhyun1.lee@samsung.com>, bonyong lee <bonyong.lee@samsung.com>