[lyx/f14/master: 4/4] Merge branch 'master' into f14

[José Abílio Oliveira Matos]

commit 7596aaa8d0a95b65109cc579af168dbf3979ad30
Merge: e113240 00355b8
Author: José Matos <jamatos at fedoraproject.org>
Date:   Mon Apr 11 10:05:55 2011 +0100

    Merge branch 'master' into f14

 .gitignore |    4 ++--
 lyx.spec   |   10 ++++++++--
 sources    |    2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)
---