[tito/el5: 3/3] Merge branch 'master' into el5

[Devan Goodwin]

commit fd7effeb3b25da11e7e23582c0c02057d9746db7
Merge: c24f8c1 ba77f58
Author: Devan Goodwin <dgoodwin at rm-rf.ca>
Date:   Tue Sep 4 09:48:55 2012 -0300

    Merge branch 'master' into el5

 .gitignore |    1 +
 sources    |    2 +-
 tito.spec  |   14 +++++++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)
---