Merge "Merge from master branch" into tizen_2.1
authorwonyoung12.lee <wonyoung12.lee@samsung.com>
Fri, 31 May 2013 02:12:49 +0000 (11:12 +0900)
committerGerrit Code Review <gerrit2@kim11>
Fri, 31 May 2013 02:12:49 +0000 (11:12 +0900)

Trivial merge