[gridengine/f17: 2/2] Merge branch 'master' into f17 Backport bugfix

[Orion Poplawski]

commit c2fa6fbe3bf84001b0c22f317f84c93f99b2dcf5
Merge: c1ea465 9262501
Author: Orion Poplawski <orion at nwra.com>
Date:   Mon Jul 9 16:52:46 2012 -0600

    Merge branch 'master' into f17
    Backport bugfix

 gridengine-rctemplates.patch |   24 ++++++++++++++++++++++++
 gridengine.spec              |    5 ++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---