Merge branch 'master' into tizen_2.1
authorJin Yoon <jinny.yoon@samsung.com>
Fri, 19 Apr 2013 05:28:43 +0000 (14:28 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Fri, 19 Apr 2013 05:28:43 +0000 (14:28 +0900)

Trivial merge