[flow-tools/el4: 68/68] Merge branch 'master' into el4

[Paul Komkoff]

commit 9a82e01609c8cc403f465d73c9ae3e7e453eef28
Merge: f308bb3 25842a8
Author: Paul P. Komkoff <i at stingr.net>
Date:   Mon Nov 28 16:41:03 2011 +0400

    Merge branch 'master' into el4
    
    Conflicts:
    	.gitignore
    	flow-tools.spec
    	sources

 .gitignore      |    2 +-
 flow-tools.spec |   19 ++++++++++++++++---
 sources         |    2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index 05baf6d,69c1709..b04d200
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--flow-tools-0.68.5.tar.bz2
+ /flow-tools-0.68.5.1.tar.bz2