Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/edje
authorJihoon Kim <jihoon48.kim@samsung.com>
Fri, 17 Sep 2010 11:24:42 +0000 (20:24 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Fri, 17 Sep 2010 11:24:42 +0000 (20:24 +0900)

Trivial merge