Merge branch '2.0'
authorJisung Ahn <jcastle.ahn@samsung.com>
Mon, 4 Feb 2013 05:12:08 +0000 (14:12 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Mon, 4 Feb 2013 05:12:08 +0000 (14:12 +0900)

Trivial merge