Merge branch 'master' into tizen_2.2
authorMinho Kim <minho07.kim@samsung.com>
Mon, 1 Jul 2013 07:03:33 +0000 (16:03 +0900)
committerMinho Kim <minho07.kim@samsung.com>
Mon, 1 Jul 2013 07:03:33 +0000 (16:03 +0900)

Trivial merge