Merge changes into tizen_2.1
authorGerrit Code Review <gerrit2@kim11>
Fri, 12 Apr 2013 02:46:32 +0000 (11:46 +0900)
committerGerrit Code Review <gerrit2@kim11>
Fri, 12 Apr 2013 02:46:32 +0000 (11:46 +0900)

Trivial merge