[tito/el6: 2/2] Merge branch 'master' into el6

[Devan Goodwin]

commit df35aeaa7bd419a0128054345616d8967e644172
Merge: a2cbc34 9f4f87a
Author: Devan Goodwin <dgoodwin at rm-rf.ca>
Date:   Wed Nov 16 16:51:40 2011 -0400

    Merge branch 'master' into el6

 .gitignore |    1 +
 sources    |    2 +-
 tito.spec  |   30 +++++++++++++++++++++++++++---
 3 files changed, 29 insertions(+), 4 deletions(-)
---