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

Trivial merge