upstream merge
authorJiyoun Park <jy0703.park@samsung.com>
Fri, 29 Jun 2012 05:26:42 +0000 (14:26 +0900)
committerJiyoun Park <jy0703.park@samsung.com>
Fri, 29 Jun 2012 05:26:42 +0000 (14:26 +0900)
commitdcde0b8101a1120dad86ff5bcac8332471a5673d
tree488d8a74ed11a125644dece92a9e2eaf9128ba55
parenta32305519b1ecf29e1a8dffc3a5ae8e6d68691c7
upstream merge

Change-Id: I875434fd379009dc902c8b95970ff2a0024bc70b
data/Makefile.am
packaging/emotion.spec