Merge branch 'master' into tizen_2.0
authorKyuho Jo <kyuho.jo@samsung.com>
Fri, 18 Jan 2013 06:50:57 +0000 (15:50 +0900)
committerKyuho Jo <kyuho.jo@samsung.com>
Fri, 18 Jan 2013 06:50:57 +0000 (15:50 +0900)

Trivial merge