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

[stevetraylen]

commit 2c66fe58b462e56d7d1ef3acbb224f5698550d31
Merge: d4e47f0 41ea1e5
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Thu Nov 17 21:19:47 2011 +0100

    Merge branch 'el5' into el4

 torque-fix-munge-rhbz#752079.patch |   94 ++++++++++++++++++++++++++++++++++++
 torque.spec                        |   11 ++++-
 2 files changed, 103 insertions(+), 2 deletions(-)
---