[gridsite/el4/master: 9/9] Merge branch 'master' into el4

[stevetraylen]

commit d89830bce08814dbd2dace17894d018255c49c94
Merge: 52883e3 8d3271b
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Sun Sep 26 15:02:19 2010 +0200

    Merge branch 'master' into el4
    
    Conflicts:
    	.gitignore
    	gridsite.spec
    	root-level.gacl
    	sources

 .gitignore             |    1 +
 gridsite-include.patch |   60 ++++++++++++++++++++++++++++++++++++++++++++++++
 gridsite.spec          |   30 +++++++++++++++++++----
 root-level.gacl        |   23 ++++++++++--------
 sources                |    2 +-
 5 files changed, 99 insertions(+), 17 deletions(-)
---