Merge "Merge Conflict Resolved. Review Comment implemented. [SegmentControl] NBeat...
authorPrince Kr Dubey <prince.dubey@samsung.com>
Fri, 25 Mar 2011 05:17:47 +0000 (14:17 +0900)
committerGerrit Code Review <git@Maetan>
Fri, 25 Mar 2011 05:17:47 +0000 (14:17 +0900)

Trivial merge