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

[Devan Goodwin]

commit 7f3f7329a5d53859f35c16e4f725e7bb49506da9
Merge: 2d3ad40 5a13fe0
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Wed Mar 14 16:04:30 2012 -0300

    Merge branch 'master' into f15

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