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

[Devan Goodwin]

commit 68b6479dfc13707b5a8f22df5199b0cba1cee048
Merge: c7d40c2 a3efe12
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Thu Jan 17 09:11:44 2013 -0400

    Merge branch 'master' into el6

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