[pairs/f18: 8/8] Merge branch 'master' into f18

[Rex Dieter]

commit b94f3ab118f1105a1ed6ad31e4a135ae04f8db3f
Merge: 5ef7962 a37e446
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 09:52:48 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	pairs.spec
    	sources

 .gitignore                     |    6 +-----
 pairs-4.8.95-dt_validate.patch |    9 ---------
 pairs.spec                     |   34 +++++++++++++++++++++++-----------
 sources                        |    2 +-
 4 files changed, 25 insertions(+), 26 deletions(-)
---