Merge "[2.2.1] Merge different codes between 2.2 and 3.0" into tizen_2.2
authordahyeong.kim <dahyeong.kim@samsung.com>
Mon, 29 Jul 2013 11:24:26 +0000 (11:24 +0000)
committerGerrit Code Review <gerrit@gerrit.vlan144.tizendev.org>
Mon, 29 Jul 2013 11:24:26 +0000 (11:24 +0000)

Trivial merge