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

[José Abílio Oliveira Matos]

commit 3863204eadd488ce082cec69d99dda1dfd63ea07
Merge: 7596aaa 4f0bec8
Author: José Matos <jamatos at fedoraproject.org>
Date:   Sat Apr 30 10:57:01 2011 +0100

    Merge branch 'master' into f14

 .gitignore |    1 +
 lyx.spec   |   14 +++++++-------
 sources    |    2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)
---