[spandsp/el5: 41/42] Merge branch 'master' into el6

[Jeffrey C. Ollie]

commit fe1647f3b5c357b59a8284037ecc4c99ca4223a3
Merge: 881bf47 f90a2d0
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Thu Oct 18 10:16:53 2012 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                      |    3 ++
 sources                         |    2 +-
 spandsp-0.0.6-brackets.patch    |   12 +++++++++++
 spandsp-0.0.6-brackets_am.patch |   12 +++++++++++
 spandsp.spec                    |   41 +++++++++++++++++++++++++++++++++-----
 5 files changed, 63 insertions(+), 7 deletions(-)
---