Merge branch 'beta' into develop
authorjonghwan2.park <jonghwan2.park@samsung.com>
Thu, 23 Feb 2012 08:25:16 +0000 (17:25 +0900)
committerjonghwan2.park <jonghwan2.park@samsung.com>
Thu, 23 Feb 2012 08:25:16 +0000 (17:25 +0900)

Trivial merge