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

[Devan Goodwin]

commit c7d40c20492c13a8adb1eff7fe36393849af7fd5
Merge: 58536ac 4997be8
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Fri Nov 30 08:26:12 2012 -0400

    Merge branch 'master' into el6

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