Merge remote-tracking branch 'origin/da-setting' into tizen 40/29240/1
authorheeyoung <heeyoung1008.hwang@samsung.com>
Thu, 23 Oct 2014 06:51:23 +0000 (15:51 +0900)
committerheeyoung <heeyoung1008.hwang@samsung.com>
Thu, 23 Oct 2014 06:51:40 +0000 (15:51 +0900)
Change-Id: I50ce2d2788746abcd9d941135a95aeb554befba2
Signed-off-by: heeyoung <heeyoung1008.hwang@samsung.com>

Trivial merge