[texmaker/f14/master: 5/5] Merge branch 'master' into f14

[Rex Dieter]

commit 9feb1c7751be222eb2942d6f9cd82eb637c72c72
Merge: a09bb20 d66c522
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 20 14:44:04 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	texmaker.spec

 .gitignore    |    1 +
 texmaker.spec |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletions(-)
---