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)
commitb67c3a69c5df0216c9ef6a2ebcfcb787455a73c5
tree07dc992ba750a4d4d8ba6f371276997a1d5d1377
parent5a6e861d66696e130e6ac87d862c0b4bfb6208f9
parent86a79718c78878d52b160ab7edd09dd0367cce65
Merge branch 'release' into develop

Conflicts:
package/pkginfo.manifest