Merge branch 'master' into tizen_2.0
authorByeongin Oh <quddls.oh@samsung.com>
Thu, 27 Dec 2012 06:03:46 +0000 (15:03 +0900)
committerByeongin Oh <quddls.oh@samsung.com>
Thu, 27 Dec 2012 06:03:46 +0000 (15:03 +0900)

Trivial merge