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

[Devan Goodwin]

commit c24f8c11113cdb51eac68dc31fbf99c696b9756d
Merge: c9f6368 88474df
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Thu Apr 12 16:23:12 2012 -0300

    Merge branch 'master' into el5

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