Merge branch 'hotfix' into make-improv

Conflicts:
	sliver-openvswitch.spec

diff --combined sliver-openvswitch.spec
index 5fe2b71,4737fe9..ace5596
--- 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.8.90
 -%define taglevel 6
 +%define version 1.9.90
 +%define taglevel 1
  
  %define debug_package %{nil}
  
@@@ -49,6 -49,9 +49,9 @@@ rm -rf $RPM_BUILD_ROO
  %postun
  
  %changelog
+ * Fri Nov 23 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-1.8.90-6
+ - fixes in the exp-tool makefile (bash redirections, scp with key..)
+ 
  * Tue Oct 16 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-1.8.90-5
  - numerous additional make targets for finer control (use make help)
  - including gprobe for reporting traffic to an ndnmap instance