[maxima/f14/master: 8/8] Merge remote branch 'origin/master' into f14/master

[Rex Dieter]

commit a4916fec737507a1e5cd3dc02afc3b48cbdd3e1c
Merge: b814909 44ce4a8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Oct 26 07:40:31 2010 -0500

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

 .gitignore  |    3 +-
 maxima.spec |   62 ++++++++++++++++++++++++++++++----------------------------
 sources     |    2 +-
 3 files changed, 34 insertions(+), 33 deletions(-)
---