[tito/origin/el5: 2/2] Merge branch 'master' into origin/el5

[Devan Goodwin]

commit bf5c6cb3544734e323c1e507f47315997e7a9f77
Merge: 14a0b11 856f255
Author: Devan Goodwin <dgoodwin at rm-rf.ca>
Date:   Wed Oct 5 16:37:02 2011 -0300

    Merge branch 'master' into origin/el5

 .gitignore |    1 +
 sources    |    2 +-
 tito.spec  |   20 +++++++++++++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index b40c175,0bd00a5..11862cc
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,3 @@@
 -tito-0.2.0.tar.gz
  /tito-0.3.0.tar.gz
  /tito-0.3.2.tar.gz
+ /tito-0.3.3.tar.gz