Merge branch 'master' into tizen_2.1
authorSungbok Park <parksb@samsung.com>
Thu, 2 May 2013 04:56:53 +0000 (13:56 +0900)
committerSungbok Park <parksb@samsung.com>
Thu, 2 May 2013 04:56:53 +0000 (13:56 +0900)

Trivial merge