[libpri/f14: 10/10] Merge branch 'master' into f14

[Jeffrey C. Ollie]

commit 0c91355b01303520709a78f7a37da47cc5fb000e
Merge: e94b03f 1c9a9c1
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Wed Jul 6 15:03:14 2011 -0500

    Merge branch 'master' into f14

 .gitignore                                         |   10 ++-
 ...ation.patch => libpri-1.4.12-optimization.patch |   14 +-
 libpri.spec                                        |  128 ++++++++++++++++----
 sources                                            |    4 +-
 4 files changed, 121 insertions(+), 35 deletions(-)
---