Merge branch 'master' into tizen_2.1
authorJin Yoon <jinny.yoon@samsung.com>
Thu, 11 Apr 2013 00:40:40 +0000 (09:40 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Thu, 11 Apr 2013 00:40:40 +0000 (09:40 +0900)

Trivial merge