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

[Rex Dieter]

commit 11cca2596b3fa5108f198bd699850acff0bb674a
Merge: 2161171 e97732b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 9 12:50:16 2010 -0600

    Merge remote branch 'origin/master' into f14/master
    
    Conflicts:
    	lyx.spec

 .gitignore |    2 +-
 lyx.spec   |   28 +++++++++++++++++-----------
 sources    |    2 +-
 3 files changed, 19 insertions(+), 13 deletions(-)
---