[plowshare/el5: 17/17] Merge with master branch

[Elder Marco]

commit c7124056494a2c8079a4ae956a5bf2e44942eb35
Merge: 5a34340 204baf1
Author: Elder Marco <eldermarco at gmail.com>
Date:   Tue Nov 15 20:54:20 2011 -0200

    Merge with master branch

 .gitignore     |    7 +++++++
 plowshare.spec |    7 +++++--
 sources        |    2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index d80ffbb,c806f15..01dbb40
--- a/.gitignore
+++ b/.gitignore
@@@ -1,7 -1,15 +1,14 @@@
 -/plowshare-SVN-r1391-snapshot.tar.gz
  /plowshare-SVN-r1414-snapshot.tar.gz
+ /plowshare-SVN-r1575-snapshot.tar.gz
+ /plowshare-SVN-r1591-snapshot.tar.gz
  /plowshare-SVN-r1630-snapshot.tar.gz
  /plowshare-SVN-r1645-snapshot.tar.gz
+ /plowshare-SVN-r1657-snapshot.tar.gz
+ /plowshare-snapshot-git20110816.tar.gz
  /plowshare-snapshot-git20110828.tar.gz
+ /plowshare-snapshot-git20110904.tar.gz
  /plowshare-snapshot-git20110914.tar.gz
+ /plowshare-snapshot-git20110918.tar.gz
  /plowshare-snapshot-git20110926.tar.gz
  /plowshare-snapshot-git20111023.tar.gz
+ /plowshare-snapshot-git20111030.tar.gz