Merge branch 'tizen_2.1' of ssh://tizendev.org:29418/apps/osp/Settings into tizen_2.1
authorHongryeol Gil <hr.gil@samsung.com>
Thu, 18 Apr 2013 13:00:48 +0000 (22:00 +0900)
committerHongryeol Gil <hr.gil@samsung.com>
Thu, 18 Apr 2013 13:00:48 +0000 (22:00 +0900)

Trivial merge