Merge remote branch 'origin/upstream' 2.0alpha master 2.0_alpha
authorMinsu Han <minsu81.han@samsung.com>
Wed, 13 Jun 2012 07:33:19 +0000 (16:33 +0900)
committerMinsu Han <minsu81.han@samsung.com>
Wed, 13 Jun 2012 07:33:19 +0000 (16:33 +0900)

Trivial merge