Merge branch 'master' into tizen_2.2
authorMinho Kim <minho07.kim@samsung.com>
Mon, 24 Jun 2013 01:55:37 +0000 (10:55 +0900)
committerMinho Kim <minho07.kim@samsung.com>
Mon, 24 Jun 2013 01:55:37 +0000 (10:55 +0900)

Trivial merge