Merge "merge changed things from tizen_2.1" into tizen_2.2
authorEunyoung(Erin) Choi <choiey@samsung.com>
Wed, 12 Jun 2013 06:26:42 +0000 (15:26 +0900)
committerGerrit Code Review <gerrit2@kim11>
Wed, 12 Jun 2013 06:26:42 +0000 (15:26 +0900)

Trivial merge