Merge branch 'master' into tizen_2.1
authorJin Yoon <jinny.yoon@samsung.com>
Thu, 18 Apr 2013 07:19:48 +0000 (16:19 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Thu, 18 Apr 2013 07:19:48 +0000 (16:19 +0900)

Trivial merge