[t1utils/el6/master: 4/4] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 737f9551b5a02bb53c364efe41a6d557c127c959
Merge: 99eae9c e236441
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed Jan 26 22:58:25 2011 +0100

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore            |    2 +-
 sources               |    2 +-
 t1utils-compile.patch |  313 -------------------------------------------------
 t1utils.spec          |    7 +-
 4 files changed, 6 insertions(+), 318 deletions(-)
---