Merge branch 'master' into tizen_2.0
authorMinsoo Kim <minnsoo.kim@samsung.com>
Thu, 24 Jan 2013 06:22:18 +0000 (15:22 +0900)
committerMinsoo Kim <minnsoo.kim@samsung.com>
Thu, 24 Jan 2013 06:22:18 +0000 (15:22 +0900)

Trivial merge