Merge branch 'master' into tizen_2.2
authorMinho Kim <minho07.kim@samsung.com>
Wed, 4 Sep 2013 05:29:16 +0000 (14:29 +0900)
committerMinho Kim <minho07.kim@samsung.com>
Wed, 4 Sep 2013 05:29:16 +0000 (14:29 +0900)

Trivial merge