[torque/f16: 2/2] Merge branch 'master' into f16

[stevetraylen]

commit 8df40450279cf755b71e11942aba142eb0252dd8
Merge: 84a91ca 13d785b
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Thu Nov 17 22:16:18 2011 +0100

    Merge branch 'master' into f16

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