Merge branch 'master' into tizen_2.2 2.2_release submit/tizen_2.2/20130714.154100
authorhhh.kwon <hhh.kwon@samsung.com>
Thu, 11 Jul 2013 10:58:26 +0000 (19:58 +0900)
committerhhh.kwon <hhh.kwon@samsung.com>
Thu, 11 Jul 2013 10:58:26 +0000 (19:58 +0900)

Trivial merge