[maxima/f13/master: 15/15] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit 9418efa9dab88de43a9b0bd0be5c1d33ee0bdcb7
Merge: bdd32be 44ce4a8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Oct 26 07:41:51 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	maxima.spec

 .gitignore  |    3 +-
 maxima.spec |   84 +++++++++++++++++++++++++++++++++++------------------------
 sources     |    2 +-
 3 files changed, 52 insertions(+), 37 deletions(-)
---