Merge branch 'develop' into release
authorjihye kim <jihye1128.kim@samsung.com>
Mon, 3 Dec 2012 08:13:33 +0000 (17:13 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Mon, 3 Dec 2012 08:14:14 +0000 (17:14 +0900)
commit0ff6a754e0530fe75892991a229d2c493852c8a2
tree9144bd58f022f75924eda78fe9d218611cfecfe5
parent44063ef1ed23ce632d7624a990d9d0fad4485dac
parent37601f0941fb493de3176998f52067062684fadf
Merge branch 'develop' into release

Conflicts:
package/pkginfo.manifest
VERSION