Merge branch 'develop' of gerrithost:sdk/ide/product into develop
authorTaeyoung Son <taeyoung2.son@samsung.com>
Tue, 28 Feb 2012 07:41:36 +0000 (16:41 +0900)
committerTaeyoung Son <taeyoung2.son@samsung.com>
Tue, 28 Feb 2012 07:41:36 +0000 (16:41 +0900)
Conflicts:
org.tizen.base.feature/feature.xml

Change-Id: Ie39d37e473ba68c46f5cba3d4fb28d871ff52e4c

1  2 
org.tizen.base.feature/feature.xml
package/build.linux

Simple merge
Simple merge