Merge branch 'tizen_2.1' into tizen_2.2 2.2_release submit/tizen_2.2/20130714.151345
authorGoo Lee <goo81.lee@samsung.com>
Tue, 11 Jun 2013 08:32:38 +0000 (17:32 +0900)
committerGoo Lee <goo81.lee@samsung.com>
Tue, 11 Jun 2013 08:32:38 +0000 (17:32 +0900)

Trivial merge