Merge "[controlbar] add NULL check"
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Thu, 14 Jul 2011 04:21:23 +0000 (13:21 +0900)
committerGerrit Code Review <git@Maetan>
Thu, 14 Jul 2011 04:21:23 +0000 (13:21 +0900)

Trivial merge