Merge branch 'master' into gerrithost/master
authorHyunwoo Kim <hw4444.kim@samsung.com>
Tue, 12 Feb 2013 01:44:49 +0000 (10:44 +0900)
committerHyunwoo Kim <hw4444.kim@samsung.com>
Tue, 12 Feb 2013 01:44:49 +0000 (10:44 +0900)

Trivial merge