Merge branch '2.0'
authorJisung Ahn <jcastle.ahn@samsung.com>
Sat, 19 Jan 2013 05:05:32 +0000 (14:05 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Sat, 19 Jan 2013 05:05:32 +0000 (14:05 +0900)

Trivial merge