Merge branch 'master' into tizen_2.1
authorJin Yoon <jinny.yoon@samsung.com>
Wed, 3 Apr 2013 05:20:24 +0000 (14:20 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Wed, 3 Apr 2013 05:20:24 +0000 (14:20 +0900)

Trivial merge