Merge branch 'master' into tizen_2.0
authorSangkoo Kim <sangkoo.kim@samsung.com>
Tue, 29 Jan 2013 06:25:47 +0000 (15:25 +0900)
committerSangkoo Kim <sangkoo.kim@samsung.com>
Tue, 29 Jan 2013 06:25:47 +0000 (15:25 +0900)

Trivial merge