Merge branch 'develop' into release
authorjihye kim <jihye1128.kim@samsung.com>
Fri, 18 Jan 2013 08:58:22 +0000 (17:58 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Fri, 18 Jan 2013 08:58:22 +0000 (17:58 +0900)
Conflicts:
VERSION
package/changelog
package/pkginfo.manifest

1  2 
package/changelog

Simple merge