Merge branch 'release' into develop
authorjihye kim <jihye1128.kim@samsung.com>
Fri, 17 Aug 2012 11:14:25 +0000 (20:14 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Fri, 17 Aug 2012 11:14:25 +0000 (20:14 +0900)
commitdef9744b472924f750f7e8278fe375448b030a49
tree29fce98319b697f79db7b4d47f27304a7ca36739
parentcc01c801ec0882da62e9c7fe7774aae82cd01d68
parent89cac9999903b6020d85b62b863749c204832ef1
Merge branch 'release' into develop

Conflicts:
package/pkginfo.manifest