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

[Devan Goodwin]

commit 4828ea4a649101fc5b21629e20dfc5bf5b0d6c1c
Merge: fd7effe 4997be8
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Fri Nov 30 08:26:02 2012 -0400

    Merge branch 'master' into el5

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