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)
Conflicts:
packaging/org.tizen.message.spec

> Conflicts is fixed.

Change-Id: Ie5900ab13b3ae54b45500df9e193d3251f882afb


Trivial merge