Merge branch 'master' into 2.1
authorJisung Ahn <jcastle.ahn@samsung.com>
Wed, 1 May 2013 08:13:41 +0000 (17:13 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Wed, 1 May 2013 08:13:41 +0000 (17:13 +0900)

Trivial merge