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

[Jeffrey C. Ollie]

commit 13372cd0996521fa00ea8bc759d633dfbeca7b92
Merge: c255474 b71d965
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Tue Feb 8 11:08:37 2011 -0600

    Merge branch 'master' into el6/master

 .gitignore                                         |    2 +
 ...patch => libpri-1.4.12-beta3-optimization.patch |   12 ++--
 libpri-1.4.12-beta3-swap.patch                     |   25 +++++++++
 libpri.spec                                        |   57 ++++++++++++++++++-
 sources                                            |    4 +-
 5 files changed, 89 insertions(+), 11 deletions(-)
---