[pyflowtools: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/pyflowtools

[Paul Komkoff]

commit 0d0c0192ad7fd6118f127e405909bb788b308cfd
Merge: 216e55d 183435a
Author: Paul P. Komkoff Jr <i at stingr.net>
Date:   Tue Jul 26 16:22:29 2011 +0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/pyflowtools
    
    Conflicts:
    	pyflowtools.spec

 pyflowtools.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc pyflowtools.spec
index 07e3bdb,a882d93..2c9006f
--- a/pyflowtools.spec
+++ b/pyflowtools.spec
@@@ -42,9 -42,9 +42,12 @@@ rm -rf $RPM_BUILD_ROO
  %{python_sitearch}/*
  
  %changelog
- * Wed Feb  2 2011 Paul P. Komkoff Jr <i at stingr.net> - 0.3.4.1-1
++* Tue Jul 26 2011 Paul P. Komkoff Jr <i at stingr.net> - 0.3.4.1-1
 +- add exaddr_raw field.
 +
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-9
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Sun Aug 01 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.3.4-8
  - Replace sitelib with sitearch. Otherwise fails to build from source