[maxima/f13/master: 4/4] Merge remote-tracking branch 'origin/master' into f13/master

[Rex Dieter]

commit 6867f0f4831c15c45e9a8da094e18db1bdfa3274
Merge: 9418efa a8254cf
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Feb 4 09:28:57 2011 -0600

    Merge remote-tracking branch 'origin/master' into f13/master

 .gitignore  |    9 +++++----
 maxima.spec |   13 +++++++++++--
 sources     |    2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)
---