Merge branch 'master' of ssh://git.onelab.eu/git/sfa

diff --combined sfa.spec
index 1497750,1fad71d..77e04a6
--- 1/sfa.spec
--- 2/sfa.spec
+++ b/sfa.spec
@@@ -1,6 -1,6 +1,6 @@@
  %define name sfa
  %define version 1.1
- %define taglevel 3
+ %define taglevel 4
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  %global python_sitearch       %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@@ -55,7 -55,6 +55,7 @@@ Requires: pyOpenSSL >= 0.
  Summary: the SFA layer around MyPLC
  Group: Applications/System
  Requires: sfa
 +Requires: postgresql-python
  Requires: python-psycopg2
  Requires: myplc-config
  Requires: pyOpenSSL >= 0.7
@@@ -198,6 -197,10 +198,10 @@@ f
  [ "$1" -ge "1" ] && service sfa-cm restart || :
  
  %changelog
+ * Fri Nov 18 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sfa-1.1-4
+ - fixed links and attributes in rspecs
+ - minor cleanup in the API methods, and more consistent names in manager methods
+ 
  * Thu Nov 17 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sfa-1.1-3
  - ongoing refoactoring towards more genericity
  - passes tests again although known issues remain with attributes/tags