Merge remote-tracking branch 'origin/master'

diff --combined sfa.spec
index ea11aa2,de66930..8d527e9
--- 1/sfa.spec
--- 2/sfa.spec
+++ b/sfa.spec
@@@ -1,6 -1,6 +1,6 @@@
  %define name sfa
  %define version 2.1
 -%define taglevel 9
 +%define taglevel 10
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  %global python_sitearch       %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@@ -151,7 -151,7 +151,7 @@@ make VERSIONTAG="%{version}-%{taglevel}
  rm -rf $RPM_BUILD_ROOT
  
  %files
- %{python_sitelib}/sfa/__init__.py
+ %{python_sitelib}/sfa/__init__.py*
  %{python_sitelib}/sfa/trust
  %{python_sitelib}/sfa/storage
  %{python_sitelib}/sfa/util
@@@ -249,9 -249,6 +249,9 @@@ f
  [ "$1" -ge "1" ] && service sfa-cm restart || :
  
  %changelog
 +* Wed Jun 6 2012 Tony Mack <tmack@cs.princeton.edu> - sfa-2.1-10
 +- fix bug in sfi update()
 +
  * Sun Jun 03 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sfa-2.1-9
  - fix broken sfa.util.xrn class for lowercase