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

[Devan Goodwin]

commit 22d670d354068c9dcaad60ae8c4ea66df8ff2873
Merge: 7f3f732 88474df
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Thu Apr 12 16:23:32 2012 -0300

    Merge branch 'master' into f15

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