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

[Devan Goodwin]

commit d753c8fe5b637469f17f9c92144f08de4f904f42
Merge: 4828ea4 a3efe12
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Thu Jan 17 09:11:33 2013 -0400

    Merge branch 'master' into el5

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