Merge "[copy&paste module] apply nbeat-theme resolve conflict"
authordeasung.kim <deasung.kim@samsung.com>
Thu, 18 Aug 2011 06:21:24 +0000 (15:21 +0900)
committerGerrit Code Review <git@Maetan>
Thu, 18 Aug 2011 06:21:24 +0000 (15:21 +0900)

Trivial merge