[pam_mysql/f15: 25/25] Merge branch 'master' into f15

[Paul Komkoff]

commit dfa3c3153d2cb2a74563a3c55bfddd0612a399b9
Merge: f93df02 a3d8046
Author: Paul P. Komkoff Jr <i at stingr.net>
Date:   Fri Jun 10 14:57:43 2011 +0400

    Merge branch 'master' into f15
    
    Conflicts:
    	pam_mysql.spec

 pam_mysql-0.7RC1-scrambled.patch |   33 +++++++++++++++++++++++++++++++++
 pam_mysql.spec                   |    7 ++++++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---