Merge "Merged with the latest code of setting"
authorSan Cho <san.cho@samsung.com>
Mon, 28 Jan 2013 10:13:11 +0000 (19:13 +0900)
committerGerrit Code Review <gerrit2@kim11>
Mon, 28 Jan 2013 10:13:11 +0000 (19:13 +0900)

Trivial merge