Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch

Conflicts:
	sliver-openvswitch.spec

diff --combined sliver-openvswitch.spec
index a3a5abd,66fd05a..0c94daf
--- 1/sliver-openvswitch.spec
--- 2/sliver-openvswitch.spec
+++ b/sliver-openvswitch.spec
@@@ -1,8 -1,8 +1,8 @@@
  %define name sliver-openvswitch
  # to check for any change:
  # grep AC_INIT configure.ac 
 -%define version 2.0.90
 -%define taglevel 1
 +%define version 2.1.90
 +%define taglevel 0
  
  %define debug_package %{nil}
  
@@@ -57,6 -57,11 +57,11 @@@ rm -rf $RPM_BUILD_ROO
  %postun
  
  %changelog
+ * Tue Dec 10 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-2.0.90-1
+ - merge with upstream
+ - switch to version 2, multi-threaded - specifically 2.0.90
+ - simple connectivity test - run with 'make test'
+ 
  * Sat Jul 06 2013 Giuseppe Lettieri <g.lettieri@iet.unipi.it> - sliver-openvswitch-1.11.90-1
  - merge with mainstream