Merge branch 'master' into tizen_2.1
authorJihoon Kim <jihoon48.kim@samsung.com>
Thu, 4 Apr 2013 12:35:59 +0000 (21:35 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Thu, 4 Apr 2013 12:35:59 +0000 (21:35 +0900)

Trivial merge