Merge branch 'master' of 165.213.180.234:slp/pkgs/e/edje
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 19 Jan 2011 06:27:07 +0000 (15:27 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 19 Jan 2011 06:27:07 +0000 (15:27 +0900)

Trivial merge