[asterisk/f18: 2/2] Merge branch 'master' into f18

[Jeffrey C. Ollie]

commit 28f8e4aabcd577e5cfb478c5a53170b4af4a2222
Merge: 7362580 e201004
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Tue Oct 30 13:30:41 2012 -0500

    Merge branch 'master' into f18

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