[samba/f17: 5/5] Merge branch 'master' into f17

[Jon Ciesla]

commit 6731345c9bb323dd1f7b1546d659f07809ae98cb
Merge: ab71590 f7cab41
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Apr 12 08:31:51 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	samba.spec

 .gitignore |    1 +
 samba.spec |    8 ++++++--
 sources    |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---