[samba/f16: 21/21] Merge branch 'f17' into f16

[Jon Ciesla]

commit d6e0d7d742d7c43d4c314905ace159d85f6cc83b
Merge: 4eae626 6731345
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Apr 12 08:52:45 2012 -0500

    Merge branch 'f17' into f16
    
    Conflicts:
    	.gitignore
    	samba.spec
    	sources

 .gitignore |   11 +----------
 samba.spec |   51 +++++++++++++++++++++++++++++++++++++++++++--------
 sources    |    2 +-
 3 files changed, 45 insertions(+), 19 deletions(-)
---
diff --cc .gitignore
index a45c813,760e966..51f848d
--- a/.gitignore
+++ b/.gitignore
@@@ -1,10 -1,11 +1,1 @@@
--samba-3.5.4.tar.gz
--samba-3.6.0pre1.tar.gz
--/samba-3.6.0pre2.tar.gz
--/samba-3.6.0pre3.tar.gz
--/samba-3.6.0rc1.tar.gz
--/samba-3.6.0rc2.tar.gz
--/samba-3.6.0rc3.tar.gz
--/samba-3.6.0.tar.gz
--/samba-3.6.1.tar.gz
--/samba-3.6.3.tar.gz
+ /samba-3.6.4.tar.gz