Merge branch 'master' into tizen_2.1
authorSan Cho <san.cho@samsung.com>
Wed, 3 Apr 2013 05:15:27 +0000 (14:15 +0900)
committerSan Cho <san.cho@samsung.com>
Wed, 3 Apr 2013 05:15:27 +0000 (14:15 +0900)

Trivial merge