[mathomatic/f13/master: 3/3] Merge branch 'master' into f13

[terjeros]

commit 7623bb28606f50abafa69f95281b2b01457a1de5
Merge: 7913e42 288a530
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Sat Mar 5 22:23:46 2011 +0100

    Merge branch 'master' into f13

 .gitignore                      |    1 +
 mathomatic-15.5.0-datadir.patch |   36 ++++++++++++++++++++++++++++++++++++
 mathomatic-15.5.0-m4-e.patch    |   11 +++++++++++
 mathomatic.spec                 |   14 +++++++++++++-
 sources                         |    2 +-
 5 files changed, 62 insertions(+), 2 deletions(-)
---