Merge branch 'beta' into develop
authorjonghwan2.park <jonghwan2.park@samsung.com>
Mon, 27 Feb 2012 07:42:55 +0000 (16:42 +0900)
committerjonghwan2.park <jonghwan2.park@samsung.com>
Mon, 27 Feb 2012 07:42:55 +0000 (16:42 +0900)

Trivial merge