Merge branch 'master' into tizen_2.1
authorJihoon Kim <jihoon48.kim@samsung.com>
Wed, 3 Apr 2013 07:13:36 +0000 (16:13 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Wed, 3 Apr 2013 07:13:36 +0000 (16:13 +0900)

Trivial merge