Merge branch '2.0'
authorJisung Ahn <jcastle.ahn@samsung.com>
Wed, 30 Jan 2013 08:23:33 +0000 (17:23 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Wed, 30 Jan 2013 08:23:33 +0000 (17:23 +0900)

Trivial merge