Merge branch 'master' into tizen_2.0
authorJaeyun Jeong <jyjeong@samsung.com>
Wed, 16 Jan 2013 10:28:22 +0000 (19:28 +0900)
committerJaeyun Jeong <jyjeong@samsung.com>
Wed, 16 Jan 2013 10:28:22 +0000 (19:28 +0900)
commit8d23c49ed85da473230460880e04a357e39569ab
tree5cb0aa66920d5d0f54c787cde0f91fd2209d59b2
parent66b51242099470c68d88c245fa9c0f99a05d2816
parent50fe3bcdd5a31c3a5be11133cdf4444f18fb04c2
Merge branch 'master' into tizen_2.0

Conflicts:
packaging/org.tizen.message.spec

> Conflicts is fixed.

Change-Id: Ie5900ab13b3ae54b45500df9e193d3251f882afb