[gridsite/el6: 3/3] Merge branch 'master' into el6

[stevetraylen]

commit f9acac23127137937c6f10260725260e0eab6228
Merge: e06c25a e1d9709
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed Jul 6 06:12:22 2011 +0200

    Merge branch 'master' into el6

 gridsite.spec |   41 ++++++++++++++++++++++++-----------------
 1 files changed, 24 insertions(+), 17 deletions(-)
---