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

[José Abílio Oliveira Matos]

commit 70a8f472b65416846835118c0bd9fad84172c8ff
Merge: 7c260c2 6d96f64
Author: José Matos <jamatos at fedoraproject.org>
Date:   Sat Mar 12 13:13:43 2011 +0000

    Merge branch 'master' into f14

 lyx.spec   |    8 +-
 lyxrc.dist |  586 +-----------------------------------------------------------
 2 files changed, 13 insertions(+), 581 deletions(-)
---