Merge branch 'master' into tizen_2.1
authorhhh.kwon <hhh.kwon@samsung.com>
Thu, 2 May 2013 10:21:14 +0000 (19:21 +0900)
committerhhh.kwon <hhh.kwon@samsung.com>
Thu, 2 May 2013 10:21:19 +0000 (19:21 +0900)

Trivial merge