[QTeXEngine/f12/master: 8/8] Merge branch 'master' into f12

[Chen Lei]

commit 366316d401a657ab34d7d94878c038ff6c66917d
Merge: 92588ed a433156
Author: Chen Lei <supercyper at 163.com>
Date:   Sat Sep 11 11:05:28 2010 +0800

    Merge branch 'master' into f12

 QTeXEngine-path.patch         |   50 -----------------
 QTeXEngine-svn1552-path.patch |   15 +++++
 QTeXEngine.spec               |  118 +++++++++++++++++++----------------------
 3 files changed, 70 insertions(+), 113 deletions(-)
---