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

[hannes]

commit 564f6362e3d616a3818b95de5b2d730d1b30656b
Merge: 39b18d5 2edfd49
Author: johannes lips <johannes at fedorabox.localdomain>
Date:   Sat Aug 28 11:59:48 2010 +0200

    Merge branch 'master' into f14

 texmakerx.spec |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---