Merge branch 'develop' into release
authorjihye kim <jihye1128.kim@samsung.com>
Mon, 17 Dec 2012 01:13:43 +0000 (10:13 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Mon, 17 Dec 2012 01:13:43 +0000 (10:13 +0900)
commit786eb33f773c71e13621321dd2e7d68c762e8a7c
tree84a19a7b7d5a73c05313e49c28268048cb69c094
parentbaa110bfe19bf79256e843530bc28fb885d555a3
parent0106a3249df0f0f59748eaf70c1a22d42320594d
Merge branch 'develop' into release

Conflicts:
package/changelog
package/pkginfo.manifest
VERSION
package/changelog