Merge branch '2.0'
authorJisung Ahn <jcastle.ahn@samsung.com>
Sun, 27 Jan 2013 10:10:28 +0000 (19:10 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Sun, 27 Jan 2013 10:10:28 +0000 (19:10 +0900)

Trivial merge