Merge branch 'tizen_2.1' into tizen_2.2 2.2_release submit/tizen_2.2/20130714.152527
authorjs411.kim <js411.kim@samsung.com>
Tue, 11 Jun 2013 10:30:31 +0000 (19:30 +0900)
committerjs411.kim <js411.kim@samsung.com>
Tue, 11 Jun 2013 10:30:31 +0000 (19:30 +0900)

Trivial merge