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

Trivial merge