Merge remote branch 'martins/master' into 1.13

diff --cc packaging/RPM/ctdb.spec.in
index fd61c6d3293610a273b7b035f57d29235d059c41,71ee3239aa256d172975fe81c312ee860e6b26d7..00f929486ac4bd0f73d9d8665f3bd5c7fff4ecf1
--- 1/packaging/RPM/ctdb.spec.in
--- 2/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@@ -144,14 -177,26 +177,33 @@@ development libraries for ctd
  %{_includedir}/ctdb_typesafe_cb.h
  %{_libdir}/libctdb.a
  
+ %package tests
+ Summary: CTDB test suite
+ Group: Development/Tools
+ Requires: ctdb = %{version}
+ 
+ %description tests
+ test suite for ctdb
+ 
+ %files tests
+ %defattr(-,root,root)
+ %dir %{_datadir}/%{name}-tests
+ %{_datadir}/%{name}-tests/*
+ %dir %{_libdir}/%{name}-tests
+ %{_libdir}/%{name}-tests/*
+ %{_bindir}/ctdb_run_tests
+ %{_bindir}/ctdb_run_cluster_tests
+ %doc tests/README
+ 
+ 
  %changelog
 +* Thu May 3 2012 : Version 1.42
 + - Add a new command 'reloadips' that can be used to re-read and update from
 +   the public addresses file at runtime.
 + - Sync up with upstream tdb/talloc/tevent
 + - new tests
 +* Tue Apr 3 2012 : Version 1.41
 + - add back the rebalanceip command
  * Thu Mar 1 2012 : Version 1.13
   - This is the new stable branch for modern features for ctdb.
     Main new features are performance/scaling improvements for