Merge branch 'master' into 2.0
authorJisung Ahn <jcastle.ahn@samsung.com>
Fri, 21 Dec 2012 04:54:45 +0000 (13:54 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Fri, 21 Dec 2012 04:54:45 +0000 (13:54 +0900)

Trivial merge