[apr-api-docs/f13: 9/9] Merge branch 'master' into f13

[bojan]

commit 30d0c49e1cc8fa1811c73dde073b3fca8ae54a42
Merge: d762802 e0194c9
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Wed May 25 18:49:17 2011 +1000

    Merge branch 'master' into f13

 apr-api-docs-doxygen.patch |    3 ++-
 apr-api-docs.spec          |   17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)
---