Merge branch 'develop' into internal_release
authorBon-Yong Lee <bonyong.lee@samsung.com>
Mon, 23 Jul 2012 01:35:42 +0000 (10:35 +0900)
committerBon-Yong Lee <bonyong.lee@samsung.com>
Mon, 23 Jul 2012 01:35:42 +0000 (10:35 +0900)
commit20096d2a1a3753db3f62ce9793e6e23fd051b7b2
treea50ab7673c16053c4c0c640f7c94324184e9c9fd
parent9641b4035f246cb07fc46e4b6b43f6f8c3f14d78
parente58635fb8e1dea2e40666e1f54947ec26955f84f
Merge branch 'develop' into internal_release

Conflicts:
org.tizen.cli/doc/install/bin/sign
org.tizen.cli/doc/install/bin/wgt
org.tizen.cli/doc/install/bin_/sign
org.tizen.cli/doc/install/bin_/web-packaging
org.tizen.cli/doc/install/bin_/web-signing
org.tizen.cli/doc/install/bin_/wgt
package/pkginfo.manifest
package/pkginfo.manifest