Merge branch 'release' into develop
authorjihye kim <jihye1128.kim@samsung.com>
Tue, 12 Feb 2013 09:40:08 +0000 (18:40 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Tue, 12 Feb 2013 09:40:08 +0000 (18:40 +0900)
commit1b07c22587b93798c2841f539107aef2882053bb
tree5e32165b80a824b6a6de48745b701a5f5f84c873
parentbb2cf1d7e2471452d29190b93f9d57bd5f41e66b
parentd571b8faf2ccd64a2873e628031d25149c454550
Merge branch 'release' into develop

Conflicts:
VERSION
package/changelog
package/pkginfo.manifest