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

[stevetraylen]

commit e62b6957493cd8aa4e0c68dd7ce93f8a93c68cea
Merge: 2c66fe5 c366dae
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Thu Nov 17 22:21:35 2011 +0100

    Merge branch 'el5' into el4

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