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

[Jeffrey C. Ollie]

commit f4213682a2ead0b953b6268db102930d62156e73
Merge: e6eb5f6 d69bb16
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Wed Mar 23 10:34:02 2011 -0500

    Merge branch 'f14/master' into f13/master

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