[torque/el4: 4/4] Merge branch 'el5' into el4

[stevetraylen]

commit ae785832cdc4255a9f79379871d7350d0efec0c0
Merge: fc4cfd2 85bee54
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Mon Sep 19 01:22:11 2011 +0200

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

 torque.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---