Merge branch 'master' into tizen_2.2
authorhhh.kwon <hhh.kwon@samsung.com>
Wed, 3 Jul 2013 13:38:37 +0000 (22:38 +0900)
committerhhh.kwon <hhh.kwon@samsung.com>
Wed, 3 Jul 2013 13:38:37 +0000 (22:38 +0900)

Trivial merge