Merge branch 'develop' into release
authordonghee yang <donghee.yang@samsung.com>
Wed, 28 Nov 2012 04:40:08 +0000 (13:40 +0900)
committerdonghee yang <donghee.yang@samsung.com>
Wed, 28 Nov 2012 04:40:08 +0000 (13:40 +0900)
commit385c48021053412ecf2c715e8337b84fea78fc2f
treec8b17d58115c721678fe86bb96ee395614e0f7d6
parenta11b17a9ba8c636c959decea5ba42d4ed4a3bcad
parent540439e7135acd2b93fa33a654f79a8fec3a8ac8
Merge branch 'develop' into release

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