Merge branch 'master' into tizen_2.2
authorhhh.kwon <hhh.kwon@samsung.com>
Tue, 1 Oct 2013 05:35:48 +0000 (14:35 +0900)
committerhhh.kwon <hhh.kwon@samsung.com>
Tue, 1 Oct 2013 05:35:48 +0000 (14:35 +0900)

Trivial merge