[apr-util/f13: 10/10] Merge branch 'master' into f13

[bojan]

commit 7d170f942f81a97cd12d0bee2e53b9023551d9c9
Merge: 7b20419 e1f4154
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Wed May 18 14:57:57 2011 +1000

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore                             |    9 +++++--
 apr-util-1.3.11-ldap_rebind_init.patch |   13 ++++++++++++
 apr-util-1.3.11.tar.bz2.asc            |   17 ++++++++++++++++
 apr-util-1.3.9.tar.bz2.asc             |   17 ----------------
 apr-util.spec                          |   33 ++++++++++++++++++++++++++++++-
 sources                                |    2 +-
 6 files changed, 68 insertions(+), 23 deletions(-)
---