Upstream merge
authorJiyoun Park <jy0703.park@samsung.com>
Wed, 20 Jun 2012 08:36:56 +0000 (17:36 +0900)
committerJiyoun Park <jy0703.park@samsung.com>
Wed, 20 Jun 2012 08:36:56 +0000 (17:36 +0900)
commitc8c07c99ba02d791a6a36fe11537a11b0b46bb02
tree6cbfcab1579c546cf3bed13ecc5fb3f35e8b0946
parent0937855f0238700ad26c3e22fec2a2750907cbc8
Upstream merge

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