Merge branch 'master' into sdk
authorJin Yoon <jinny.yoon@samsung.com>
Thu, 24 Jan 2013 08:43:19 +0000 (17:43 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Thu, 24 Jan 2013 08:43:19 +0000 (17:43 +0900)

Trivial merge