Merge branch 'master' into tizen_2.0
authorByeongin Oh <quddls.oh@samsung.com>
Thu, 3 Jan 2013 07:19:13 +0000 (16:19 +0900)
committerByeongin Oh <quddls.oh@samsung.com>
Thu, 3 Jan 2013 07:19:13 +0000 (16:19 +0900)

Trivial merge