Merge branch '2.0'
authorJisung Ahn <jcastle.ahn@samsung.com>
Wed, 30 Jan 2013 07:49:34 +0000 (16:49 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Wed, 30 Jan 2013 07:49:34 +0000 (16:49 +0900)

Trivial merge