Merge "Modified preference label for timeout" into develop
authorkh5325.kim <kh5325.kim@samsung.com>
Tue, 26 Feb 2013 11:59:37 +0000 (20:59 +0900)
committerGerrit Code Review <gerrit2@system.s-core.co.kr>
Tue, 26 Feb 2013 11:59:37 +0000 (20:59 +0900)

Trivial merge