[asterisk/el6/master: 4/4] Merge branch 'f14' into el6

[Jeffrey C. Ollie]

commit ec15069d478324c5a300c25025bc0e226f8c7bd1
Merge: bcecc2c 093629c
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Tue Aug 24 15:23:45 2010 -0500

    Merge branch 'f14' into el6

 .gitignore    |    4 ++++
 asterisk.spec |   49 ++++++++++++++++++++++++++++++++++++++++++++++---
 sources       |    4 ++--
 3 files changed, 52 insertions(+), 5 deletions(-)
---