Merge branch 'master' into tizen_2.1
authorhhh.kwon <hhh.kwon@samsung.com>
Mon, 29 Apr 2013 13:26:57 +0000 (22:26 +0900)
committerhhh.kwon <hhh.kwon@samsung.com>
Mon, 29 Apr 2013 13:27:02 +0000 (22:27 +0900)

Trivial merge