[maxima/el6/master: 29/29] Merge remote-tracking branch 'origin/master' into el6/master

[Rex Dieter]

commit 2561912328fa5452f5824a6ef6f4ae7926390ff0
Merge: d792fe4 a8254cf
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Feb 4 09:28:18 2011 -0600

    Merge remote-tracking branch 'origin/master' into el6/master
    
    Conflicts:
    	.gitignore
    	maxima.spec
    	sources

 .gitignore  |   10 +++---
 maxima.spec |   98 ++++++++++++++++++++++++++++++++++++-----------------------
 sources     |    2 +-
 3 files changed, 66 insertions(+), 44 deletions(-)
---