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

[Devan Goodwin]

commit 58536ac378941e0fa6af7590d6b0a4a551e88d15
Merge: 899570d ba77f58
Author: Devan Goodwin <dgoodwin at rm-rf.ca>
Date:   Tue Sep 4 09:49:04 2012 -0300

    Merge branch 'master' into el6

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