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

[stevetraylen]

commit 59560ac76ac7ad15b4550064230e946a269a0744
Merge: 688834e 1c9cf1d
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed Aug 10 10:19:59 2011 +0200

    Merge branch 'el5' into el4

 torque.spec |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---