Merge branch 'master' into tizen_2.2
authorMinho Kim <minho07.kim@samsung.com>
Tue, 18 Jun 2013 01:43:02 +0000 (10:43 +0900)
committerMinho Kim <minho07.kim@samsung.com>
Tue, 18 Jun 2013 01:43:08 +0000 (10:43 +0900)

Trivial merge