[389-ds-base/f17: 2/2] Merge branch 'f17' of ssh://pkgs.fedoraproject.org/389-ds-base into f17

[Mark Reynolds]

commit 88ac8f181782a92807926b1d9b50803f6cadf84a
Merge: 78b7e4b 32c6ee6
Author: Mark Reynolds <mreynolds at redhat.com>
Date:   Mon Dec 10 15:50:03 2012 -0500

    Merge branch 'f17' of ssh://pkgs.fedoraproject.org/389-ds-base into f17
    
    Conflicts:
    	389-ds-base-git-local.sh

---