Merge branch 'master' into sdk
authorJin Yoon <jinny.yoon@samsung.com>
Tue, 12 Mar 2013 01:16:47 +0000 (10:16 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Tue, 12 Mar 2013 01:16:47 +0000 (10:16 +0900)

Trivial merge