Merge "fix TDIS-601"
authorshy81.shin <shy81.shin@samsung.com>
Tue, 30 Oct 2012 09:19:35 +0000 (18:19 +0900)
committerGerrit Code Review <gerrit2@kim11>
Tue, 30 Oct 2012 09:19:35 +0000 (18:19 +0900)

Trivial merge