Merge branch 'master' into tizen_2.0
authorSungbok Park <parksb@samsung.com>
Mon, 28 Jan 2013 19:40:17 +0000 (04:40 +0900)
committerSungbok Park <parksb@samsung.com>
Mon, 28 Jan 2013 19:40:17 +0000 (04:40 +0900)

Trivial merge