[texmakerx/f14/master: 8/8] Merge branch 'master' into f14

[hannes]

commit 875a7af95ca110a65b7690a4b3136e028ebe1231
Merge: 593f0f9 32f8a58
Author: johannes lips <johannes at fedorabox.localdomain>
Date:   Mon Mar 21 22:21:49 2011 +0100

    Merge branch 'master' into f14

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