Merge branch 'release' into develop
authorjihye kim <jihye1128.kim@samsung.com>
Sat, 8 Sep 2012 09:41:29 +0000 (18:41 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Sat, 8 Sep 2012 09:41:29 +0000 (18:41 +0900)
Conflicts:
package/pkginfo.manifest


Trivial merge