Merge branch 'master' into tizen_2.1
authorSungbok Park <parksb@samsung.com>
Thu, 25 Apr 2013 02:41:52 +0000 (11:41 +0900)
committerSungbok Park <parksb@samsung.com>
Thu, 25 Apr 2013 02:41:52 +0000 (11:41 +0900)

Trivial merge