Merge branch 'master' into tizen_2.1 tizen_2.1 2.1b_release accepted/tizen/20130520.101419 accepted/tizen_2.1/20130425.024737 submit/tizen/20130517.045409 submit/tizen_2.1/20130424.234219
authorJihoon Kim <jihoon48.kim@samsung.com>
Mon, 8 Apr 2013 10:35:08 +0000 (19:35 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Mon, 8 Apr 2013 10:35:08 +0000 (19:35 +0900)

Trivial merge