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

[Jeffrey C. Ollie]

commit 736258033bab830840478a0262de69c292a92d5e
Merge: 52e1219 d373faf
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Thu Oct 18 09:24:36 2012 -0500

    Merge branch 'master' into f18

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