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

[Devan Goodwin]

commit ab67305cb126a7bc0f6db5afbc5f00b51aaf3a25
Merge: 8f9223c 0f7fc0d
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Mon Mar 24 09:55:18 2014 -0300

    Merge branch 'master' into el6

 .gitignore |    1 +
 sources    |    2 +-
 tito.spec  |   45 ++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 44 insertions(+), 4 deletions(-)
---