Merge branch 'master' into tizen_2.2 submit/tizen_2.2/20130716.173515 submit/tizen_2.2/20130716.211257 submit/tizen_2.2/20130717.053218
authorMinho Kim <minho07.kim@samsung.com>
Mon, 15 Jul 2013 11:58:53 +0000 (20:58 +0900)
committerMinho Kim <minho07.kim@samsung.com>
Mon, 15 Jul 2013 11:58:53 +0000 (20:58 +0900)

Trivial merge