Merge branch 'master' into tizen_2.0
authorSoyoung Kim <sy037.kim@samsung.com>
Thu, 13 Dec 2012 02:33:14 +0000 (11:33 +0900)
committerSoyoung Kim <sy037.kim@samsung.com>
Thu, 13 Dec 2012 02:33:29 +0000 (11:33 +0900)

Trivial merge