[gridsite/el5: 2/3] Merge branch 'master' into el5

[stevetraylen]

commit 8700304e9db581f72f6ba4b4a316a4888324f462
Merge: 5cae3fb bdaf7ba
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Sun Jul 3 19:56:37 2011 +0200

    Merge branch 'master' into el5

 gridsite.spec |   37 ++++++++++++++++++++-----------------
 1 files changed, 20 insertions(+), 17 deletions(-)
---