Merge branch 'master' into tizen_2.1
authorhhh.kwon <hhh.kwon@samsung.com>
Thu, 18 Apr 2013 14:36:58 +0000 (23:36 +0900)
committerhhh.kwon <hhh.kwon@samsung.com>
Thu, 18 Apr 2013 14:37:32 +0000 (23:37 +0900)

Trivial merge