Merge branch 'develop' into release
authordonghyuk.yang <donghyuk.yang@samsung.com>
Tue, 18 Dec 2012 08:07:47 +0000 (17:07 +0900)
committerdonghyuk.yang <donghyuk.yang@samsung.com>
Tue, 18 Dec 2012 08:07:47 +0000 (17:07 +0900)
commit9cb62c0d2c1d94a709728a0afde9d1772bffa7c5
tree15d640b215a82fd147fc5067ae6db21de3487a9c
parentec1cb66e64a4dd3f15e775637b80f4f0af1681d7
parent8ffd28fb68ca8ed8650034f27da8083401edd1fe
Merge branch 'develop' into release

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