Merge branch 'master' into T
authorHyunwoo Kim <hw4444.kim@samsung.com>
Mon, 4 Feb 2013 11:33:03 +0000 (20:33 +0900)
committerHyunwoo Kim <hw4444.kim@samsung.com>
Mon, 4 Feb 2013 11:33:03 +0000 (20:33 +0900)

Trivial merge