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

Trivial merge