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

[terjeros]

commit 1ce5c45b8c83de94c6087ad92273424761e3fc2d
Merge: 55e4b7d 6e381ee
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Mon Jan 17 15:17:19 2011 +0100

    Merge branch 'master' into f13

 .gitignore      |    1 +
 mathomatic.spec |   25 ++++++++++++++++++++-----
 sources         |    2 +-
 3 files changed, 22 insertions(+), 6 deletions(-)
---