Merge commit 'refs/changes/80/59380/1' of ssh://tizendev.org:29418/framework/api...
authorMyoungJune Park <mj2004.park@samsung.com>
Wed, 10 Apr 2013 08:42:35 +0000 (17:42 +0900)
committerMyoungJune Park <mj2004.park@samsung.com>
Wed, 10 Apr 2013 08:42:35 +0000 (17:42 +0900)
commit71794764e21ad92ca0103e3338ee7ad01a60a9af
tree90611905a0e6e7fbf4b243596db7ef75d989658c
parentc6748d2e4a7877ec02d8d5ab9117fa9416d53936
parentf6979318dcf5a721b5aa61d747de75e072dea1a6
Merge commit 'refs/changes/80/59380/1' of ssh://tizendev.org:29418/framework/api/system-settings

Conflicts:
TC_gui/main.c