Merge branch 'master' of taebak:slp/pkgs/e/edje
authorJihoon Kim <jihoon48.kim@samsung.com>
Thu, 27 Jan 2011 00:30:03 +0000 (09:30 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Thu, 27 Jan 2011 00:30:03 +0000 (09:30 +0900)

Trivial merge