Merge "merged with latest setting code"
authorSan Cho <san.cho@samsung.com>
Mon, 4 Mar 2013 06:00:48 +0000 (15:00 +0900)
committerGerrit Code Review <gerrit2@kim11>
Mon, 4 Mar 2013 06:00:48 +0000 (15:00 +0900)

Trivial merge