Merge branch 'master' into sdk
authorJin Yoon <jinny.yoon@samsung.com>
Wed, 6 Mar 2013 10:21:56 +0000 (19:21 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Wed, 6 Mar 2013 10:21:56 +0000 (19:21 +0900)

Trivial merge