Merge commit 'refs/changes/53/15053/2' of ssh://172.21.17.55:29419/sdk/ide/common...
authorJihoon Song <jihoon80.song@samsung.com>
Wed, 3 Apr 2013 09:25:53 +0000 (18:25 +0900)
committerJihoon Song <jihoon80.song@samsung.com>
Wed, 3 Apr 2013 09:25:53 +0000 (18:25 +0900)
commitde14b4ffbdc66bfb75882d2d51ce884a73d0dc74
treec679162ecbb08ee32ed50e29b5de2d2346f72d81
parent65e37475e308fee8ef2b23a7f106328283303cad
parent684a2d54843161666e30dd83bfbcb2d09ebb6162
Merge commit 'refs/changes/53/15053/2' of ssh://172.21.17.55:29419/sdk/ide/common-eplugin into tizen_2.1

Conflicts:
org.tizen.common/src/org/tizen/common/rds/RdsDeployer.java

Change-Id: Ie2535bee67dcc9e6550d469568567d6cb369bc68
org.tizen.common/src/org/tizen/common/rds/RdsDeployer.java