[freeradius/f13/master: 6/6] Merge branch 'master' into f13

[John Dennis]

commit 09d758d645ac18715f07a0e40be00bcd5434b5ad
Merge: 166695d 9090233
Author: John Dennis <jdennis at redhat.com>
Date:   Tue Oct 19 15:52:49 2010 -0400

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	freeradius.spec
    	sources

 .gitignore      |    2 +-
 freeradius.spec |  150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 sources         |    2 +-
 3 files changed, 150 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index a81feee,1939ae4..05cc263
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--freeradius-server-2.1.9.tar.bz2
+ /freeradius-server-2.1.10.tar.bz2