Merge branch '2.0_beta'
authorJin Yoon <jinny.yoon@samsung.com>
Sun, 4 Nov 2012 00:14:11 +0000 (09:14 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Sun, 4 Nov 2012 00:14:11 +0000 (09:14 +0900)

Trivial merge