Merge branch 'master' into 2.1
authorJisung Ahn <jcastle.ahn@samsung.com>
Fri, 5 Apr 2013 09:48:32 +0000 (18:48 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Fri, 5 Apr 2013 09:48:32 +0000 (18:48 +0900)

Trivial merge