Merge branch 'master' into tizen_2.2
authorhhh.kwon <hhh.kwon@samsung.com>
Mon, 24 Jun 2013 08:45:58 +0000 (17:45 +0900)
committerhhh.kwon <hhh.kwon@samsung.com>
Mon, 24 Jun 2013 08:45:58 +0000 (17:45 +0900)

Trivial merge