Merge branch 'master' into tizen_2.0
authorSeunghwan Lee <sh.cat.lee@samsung.com>
Mon, 14 Jan 2013 06:52:05 +0000 (15:52 +0900)
committerSeunghwan Lee <sh.cat.lee@samsung.com>
Mon, 14 Jan 2013 06:52:05 +0000 (15:52 +0900)

Trivial merge