Merge branch 'master' into 2.0
authorJisung Ahn <jcastle.ahn@samsung.com>
Fri, 4 Jan 2013 05:56:27 +0000 (14:56 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Fri, 4 Jan 2013 05:56:27 +0000 (14:56 +0900)

Trivial merge