Merge branch 'master' into 2.0
authorJisung Ahn <jcastle.ahn@samsung.com>
Mon, 7 Jan 2013 11:30:45 +0000 (20:30 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Mon, 7 Jan 2013 11:30:45 +0000 (20:30 +0900)

Trivial merge