Merge "N_SE-39060" into tizen_2.1
authorTae-Yun An <taeyun.an@samsung.com>
Fri, 24 May 2013 10:10:18 +0000 (19:10 +0900)
committerGerrit Code Review <gerrit2@kim11>
Fri, 24 May 2013 10:10:18 +0000 (19:10 +0900)

Trivial merge