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

[José Abílio Oliveira Matos]

commit e1132407402cb954a4e99e16be1a997ca593fceb
Merge: 70a8f47 22e0201
Author: José Matos <jamatos at fedoraproject.org>
Date:   Tue Mar 29 12:49:03 2011 +0100

    Merge branch 'master' into f14

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