[asterisk/f13/master: 3/3] Merge branch 'f14' into f13

[Jeffrey C. Ollie]

commit b4b82406fbbeed018b01b5a98991316736cd795d
Merge: 62729c7 5a60a2c
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Tue Aug 24 14:07:07 2010 -0500

    Merge branch 'f14' into f13

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