Merge branch 'master' into tizen_2.1
authorJin Yoon <jinny.yoon@samsung.com>
Mon, 29 Apr 2013 06:15:48 +0000 (15:15 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Mon, 29 Apr 2013 06:15:48 +0000 (15:15 +0900)

Trivial merge