Merge "Fixed Merged conflict(Automerging for nbeat-inc.edc and nbeat-black-inc.edc...
authorRajeev Ranjan <rajeev.r@samsung.com>
Tue, 19 Apr 2011 06:06:42 +0000 (15:06 +0900)
committerGerrit Code Review <git@Maetan>
Tue, 19 Apr 2011 06:06:42 +0000 (15:06 +0900)

Trivial merge