Merge branch 'master' into tizen_2.0
authorhhh.kwon <hhh.kwon@samsung.com>
Mon, 7 Jan 2013 10:53:00 +0000 (19:53 +0900)
committerhhh.kwon <hhh.kwon@samsung.com>
Mon, 7 Jan 2013 10:53:00 +0000 (19:53 +0900)

Trivial merge