Merge branch '2.0'
authorJisung Ahn <jcastle.ahn@samsung.com>
Fri, 25 Jan 2013 02:53:26 +0000 (11:53 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Fri, 25 Jan 2013 02:53:26 +0000 (11:53 +0900)

Trivial merge