Merge remote-tracking branch 'origin/unstable' into testing

diff --cc branch.mk
index 936a67569f072bfad1eeb935aca211a0e0530e86,afde0f838e8e39e2e2b5abe863169d7891a97131..dbecaaa4bb30c9a334af654716d6bb4acc1dfbf0
--- 1/branch.mk
--- 2/branch.mk
+++ b/branch.mk
@@@ -1,1 -1,1 +1,1 @@@
- include $(SDK_SRC_BASE)/cnf/testing.bnd
 -BRANCH=unstable
++BRANCH=testing

diff --cc sdk/branches/testing.bnd
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..8bf306ae1ffdae29609fa92bc6587e6f00de7f92
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@@ -1,0 -1,0 +1,4 @@@
++major=2
++minor=1
++micro=20
++qualifier=.next