Merge branch 'master' into tizen_2.0
authorByeongin Oh <quddls.oh@samsung.com>
Mon, 7 Jan 2013 05:33:58 +0000 (14:33 +0900)
committerByeongin Oh <quddls.oh@samsung.com>
Mon, 7 Jan 2013 05:33:58 +0000 (14:33 +0900)

Trivial merge