Merge branch '2.0'
authorJisung Ahn <jcastle.ahn@samsung.com>
Tue, 16 Apr 2013 07:44:45 +0000 (16:44 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Tue, 16 Apr 2013 07:44:45 +0000 (16:44 +0900)

Trivial merge