Merge "[controlbar] change edje object-> layout object"
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 18 Apr 2011 04:17:38 +0000 (13:17 +0900)
committerGerrit Code Review <git@Maetan>
Mon, 18 Apr 2011 04:17:38 +0000 (13:17 +0900)

Trivial merge