[torque/el4/master: 31/31] Merge branch 'el5' into el4

[stevetraylen]

commit f3f94effb5935ff58bbfdfef9ad0732ee79c3f59
Merge: fcb51e9 de8d189
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed Sep 29 11:08:30 2010 +0200

    Merge branch 'el5' into el4
    
    Conflicts:
    	.gitignore
    	sources
    	torque.spec

 .gitignore  |    4 +++-
 sources     |    2 +-
 torque.spec |    5 ++++-
 3 files changed, 8 insertions(+), 3 deletions(-)
---