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

Conflicts:
	sliver-openvswitch.spec

diff --combined sliver-openvswitch.spec
index 63204df,3149b8e..7daf495
--- 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 1.10.90
 -%define taglevel 3
 +%define version 1.11.90
 +%define taglevel 0
  
  %define debug_package %{nil}
  
@@@ -57,6 -57,9 +57,9 @@@ rm -rf $RPM_BUILD_ROO
  %postun
  
  %changelog
+ * Sat Jul 06 2013 Giuseppe Lettieri <g.lettieri@iet.unipi.it> - sliver-openvswitch-1.10.90-3
+ - merge with mainstream
+ 
  * Wed May 01 2013 Giuseppe Lettieri <g.lettieri@iet.unipi.it> - sliver-openvswitch-1.10.90-2
  - - fixed several bugs in the external-nodes support in exp-tool/Makefile
  - - let sliver-ovs return an error if tap device configuration failed