Merge branch 'develop' into release
authorjihye kim <jihye1128.kim@samsung.com>
Tue, 6 Nov 2012 07:12:28 +0000 (16:12 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Tue, 6 Nov 2012 07:12:28 +0000 (16:12 +0900)
commit15329354b21d1e46d4037bf0ef2bba9fdb108254
treed70063bc79cab9a55f9bd76f00aa8c885e6943a2
parente45ee919b69b340311d4d5b2c50e45a3d483dbf9
parente39002426dfa3be6a38b6fb631aa948bd4f0c61d
Merge branch 'develop' into release

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