Merge branch 'master' into 2.0
authorJisung Ahn <jcastle.ahn@samsung.com>
Mon, 14 Jan 2013 06:41:32 +0000 (15:41 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Mon, 14 Jan 2013 06:41:32 +0000 (15:41 +0900)

Trivial merge