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

[Rex Dieter]

commit e348e8b584df12d61b61c408bac846c83acfb1c6
Merge: a33b827 9106482
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Dec 9 10:50:30 2010 -0600

    Merge remote branch 'origin/master' into f14/master

 .gitignore                                         |    2 +-
 ...xdg_open.patch => lyx-2.0.0beta2-xdg_open.patch |   35 ++++++++++++-------
 lyx.spec                                           |    9 +++--
 sources                                            |    2 +-
 4 files changed, 30 insertions(+), 18 deletions(-)
---