Merge branch 'master' into tizen_2.0
authorSunghyun Kwon <sh0701.kwon@samsung.com>
Tue, 5 Feb 2013 13:08:26 +0000 (22:08 +0900)
committerSunghyun Kwon <sh0701.kwon@samsung.com>
Tue, 5 Feb 2013 13:08:26 +0000 (22:08 +0900)

Trivial merge