Merge branch 'master' into tizen_2.0
authorSan Cho <san.cho@samsung.com>
Tue, 5 Feb 2013 10:18:52 +0000 (19:18 +0900)
committerSan Cho <san.cho@samsung.com>
Tue, 5 Feb 2013 10:18:52 +0000 (19:18 +0900)

Trivial merge