Merge "[*][Button] Applied upstream commit r63378. This fixes conference call label...
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Wed, 14 Sep 2011 10:34:22 +0000 (19:34 +0900)
committerGerrit Code Review <git@Maetan>
Wed, 14 Sep 2011 10:34:22 +0000 (19:34 +0900)

Trivial merge