[libpri/el6/master: 4/4] Merge remote branch 'origin/master' into el6/master

[Jeffrey C. Ollie]

commit c255474e23d0b771fc967744dde8f617e7a05ce1
Merge: d59cad1 e2ecbe2
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Thu Oct 21 14:02:55 2010 -0500

    Merge remote branch 'origin/master' into el6/master

 .gitignore  |    9 ++++-
 libpri.spec |  109 +++++++++++++++++++++++++++++++++++++++++++++--------------
 sources     |    4 +-
 3 files changed, 93 insertions(+), 29 deletions(-)
---