Merge branch 'tizen' of tizen-public:/sdk/tools/sdk-build into tizen

Conflicts:
	test/build-server.basic1/testsuite

diff --cc test/build-server.basic1/testsuite
index 3fe9461fd11ed9d5aafba10d919a2b7ab2cb8d3c,09498fed8884422481415afde7fae3cb00d0ba63..b720c6afcb15452cb6446547743744f63fb9c815
--- 1/test/build-server.basic1/testsuite
--- 2/test/build-server.basic1/testsuite
+++ b/test/build-server.basic1/testsuite
@@@ -36,4 -36,4 +36,5 @@@ build-cli-35.testcas
  build-cli-36.testcase
  build-cli-37.testcase
  build-cli-38.testcase
+ build-cli-39.testcase
 +build-cli-41.testcase