Merge branch 'master' into tizen_2.0
authorSangkoo Kim <sangkoo.kim@samsung.com>
Fri, 1 Feb 2013 07:50:58 +0000 (16:50 +0900)
committerSangkoo Kim <sangkoo.kim@samsung.com>
Fri, 1 Feb 2013 07:50:58 +0000 (16:50 +0900)

Trivial merge