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

[stevetraylen]

commit 95cf18855357e85d4e94840452e325497f17aa6d
Merge: e4e17e7 ca1f55b
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Sat Dec 3 19:41:28 2011 +0100

    Merge branch 'el5' into el4

 ...-2.5.7-rhbz#759141-r5167-pbs_server-crash.patch |   12 ++++++++++++
 torque.spec                                        |   11 ++++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---