Merge "Fix problems [N_SE-37779/N_SE-37278]" into tizen_2.1
authorTaejun <tj.twt.park@samsung.com>
Wed, 8 May 2013 07:24:35 +0000 (16:24 +0900)
committerGerrit Code Review <gerrit2@kim11>
Wed, 8 May 2013 07:24:35 +0000 (16:24 +0900)

Trivial merge