[cppad/el6: 5/5] Merge branch 'master' into el6

[Bradley M. Bell]

commit 924f625484f85726a6bd1d6987dd3d1d9ec93cd3
Merge: 0abfc5f d0dd864
Author: Brad Bell <bradbell at seanet.com>
Date:   Tue Oct 18 07:02:36 2011 -0700

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore |    4 +--
 cppad.spec |   77 ++++++++++++++++++++++++++++++++++++++++-------------------
 sources    |    2 +-
 3 files changed, 54 insertions(+), 29 deletions(-)
---