Merge branch 'master' into tizen_2.0
authorKyuho Jo <kyuho.jo@samsung.com>
Fri, 1 Feb 2013 11:31:13 +0000 (20:31 +0900)
committerKyuho Jo <kyuho.jo@samsung.com>
Fri, 1 Feb 2013 11:31:13 +0000 (20:31 +0900)

Trivial merge