Merge remote-tracking branch 'origin/tizen' into mw

Conflicts:
	package/changelog

Change-Id: I5a87cc90b07160b6f688aab29e1b1cc1002cc813
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>

diff --cc package/changelog
index aad68db,f7b9901..6a2e073
--- 1/package/changelog
--- 2/package/changelog
+++ b/package/changelog
@@@ -1,7 -1,7 +1,9 @@@
++* 0.1.429
++- [Title] update version
++== yonghwan.jeon <yonghwan82.jeon@samsung.com> 2014-05-14
  * 0.1.428
  - [Title] changed configuration package name
  == changhyun1.lee <changhyun1.lee@samsung.com> 2014-05-14
- * 0.1.427
 -* 0.1.427 
  - [Title] update version
  == yonghwan.jeon <yonghwan82.jeon@samsung.com> 2014-05-13 01:24
  * 0.1.426

diff --cc package/pkginfo.manifest
index c49de82,c49de82..b8f2542
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,5 -1,5 +1,5 @@@
  Package : web-ui-builder-eplugin
--Version :0.1.428
++Version :0.1.429
  OS : ubuntu-32
  Build-host-os : ubuntu-32
  Maintainer : Hoon Kang <h245.kang@samsung.com>
@@@ -11,7 -11,7 +11,7 @@@ Source : web-ui-builder-eplugi
  Description : 
  
  Package : web-ui-builder-eplugin
--Version :0.1.427
++Version :0.1.429
  OS : ubuntu-64
  Build-host-os : ubuntu-64
  Maintainer : Hoon Kang <h245.kang@samsung.com>
@@@ -23,7 -23,7 +23,7 @@@ Source : web-ui-builder-eplugi
  Description : 
  
  Package : web-ui-builder-eplugin
--Version :0.1.427
++Version :0.1.429
  OS : windows-32
  Build-host-os : ubuntu-32
  Maintainer : Hoon Kang <h245.kang@samsung.com>
@@@ -35,7 -35,7 +35,7 @@@ Source : web-ui-builder-eplugi
  Description :
  
  Package : web-ui-builder-eplugin
--Version :0.1.427
++Version :0.1.429
  OS : windows-64
  Build-host-os : ubuntu-64
  Maintainer : Hoon Kang <h245.kang@samsung.com>
@@@ -47,7 -47,7 +47,7 @@@ Source : web-ui-builder-eplugi
  Description :
  
  Package : web-ui-builder-eplugin
--Version :0.1.427
++Version :0.1.429
  OS : macos-64
  Build-host-os : ubuntu-64
  Maintainer : Hoon Kang <h245.kang@samsung.com>