[libpri/el6: 2/2] Merge branch 'master' into el6

[Jeffrey C. Ollie]

commit 4c80c28a6236779e09a41585aa79d8b42d896f75
Merge: 13372cd 1c9a9c1
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Wed Jul 6 15:05:40 2011 -0500

    Merge branch 'master' into el6

 .gitignore                                         |    2 +
 libpri-1.4.12-beta3-swap.patch                     |   25 ----------
 ...ation.patch => libpri-1.4.12-optimization.patch |   14 +++---
 libpri.spec                                        |   50 ++++++++++++++++++--
 sources                                            |    4 +-
 5 files changed, 56 insertions(+), 39 deletions(-)
---