[ferm/el5: 2/2] Merge remote-tracking branch 'origin/master' into el5

[Pavel Alexeev]

commit 1cdff4d46d4148d2dd392c1305ed50ced67dc346
Merge: 220513d feaa0f7
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Wed Dec 28 10:49:28 2011 +0400

    Merge remote-tracking branch 'origin/master' into el5

 .gitignore |    1 +
 ferm.spec  |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 3f3c9bd,8f11f59..eecaeaa
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -ferm-2.0.7.tar.gz
  /ferm-2.0.9.tar.gz
+ /ferm-2.1.tar.gz