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

[stevetraylen]

commit 84a91ca9b7f6d1ed90766d9abef79838e7f9a84e
Merge: 1e85b41 24f9b08
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Thu Nov 17 19:24:34 2011 +0100

    Merge branch 'master' into f16
    
    Conflicts:
    	torque.spec

 .gitignore  |    1 +
 sources     |    2 +-
 torque.spec |    7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)
---