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

[Jeffrey C. Ollie]

commit 6c0a73427d25b0977d4ae573ba5dcbab2b5e19af
Merge: f421368 8114489
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Fri Apr 22 08:12:03 2011 -0500

    Merge branch 'f14/master' into f13/master

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