Merge branch 'master' into tizen_2.1
authorJin Yoon <jinny.yoon@samsung.com>
Thu, 21 Mar 2013 01:41:53 +0000 (10:41 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Thu, 21 Mar 2013 01:41:53 +0000 (10:41 +0900)

Trivial merge