Merge "[controlbar] fix build error"
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 18 Apr 2011 05:14:51 +0000 (14:14 +0900)
committerGerrit Code Review <git@Maetan>
Mon, 18 Apr 2011 05:14:51 +0000 (14:14 +0900)

Trivial merge