Merge branch 'master' into tizen_2.2
authorMinho Kim <minho07.kim@samsung.com>
Fri, 5 Jul 2013 10:31:11 +0000 (19:31 +0900)
committerMinho Kim <minho07.kim@samsung.com>
Fri, 5 Jul 2013 10:31:11 +0000 (19:31 +0900)

Trivial merge