Merge branch 'master' into 2.1
authorJisung Ahn <jcastle.ahn@samsung.com>
Tue, 16 Apr 2013 07:59:10 +0000 (16:59 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Tue, 16 Apr 2013 07:59:10 +0000 (16:59 +0900)

Trivial merge