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)
commite5f5964402e856d0ef1db0cf97069d29750c4f62
treeea93e5f644acca64c6cac2d88c99e52379e4e9ca
parenta3ceaa4cfa4784f46268b95e53af8325b34fffe9
parent7551c7bd3f1bc10aad5daac667bcec118bc44974
Merge branch 'develop' into release

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