[pipestat/el5/master: 9/9] merge with master

[smilner]

commit 163832650f6fcf4b1874c2ee5764f3b6715d3266
Merge: ba8e46a 1406131
Author: Steve 'Ashcrow' Milner <stevem at gnulinux.net>
Date:   Wed Oct 13 10:52:50 2010 -0400

    merge with master

 .gitignore    |    2 +-
 pipestat.spec |   10 ++++++++--
 sources       |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 010e3b4,2a64da7..e7e41fb
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,1 @@@
--pipestat-0.3.0.tar.gz
 -/pipestat-0.4.0.tar.gz
+ /pipestat-0.4.1.tar.gz