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

[Jeffrey C. Ollie]

commit cd55fada7eab5f1e87761c0d3177b6bcb1962d47
Merge: b4b8240 093629c
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Tue Aug 24 15:22:25 2010 -0500

    Merge branch 'f14' into f13

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