[tito/el5/master: 11/11] Merge branch 'f13' into el5

[Devan Goodwin]

commit 67f40fd26faed1999ee083126aa9062f6c0a8ace
Merge: 4e9268f 7f5d8a8
Author: Devan Goodwin <dgoodwin at rm-rf.ca>
Date:   Wed Jan 5 14:52:03 2011 -0400

    Merge branch 'f13' into el5
    
    Conflicts:
    	.gitignore
    	sources
    	tito.spec

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