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

[Rex Dieter]

commit 52dd230896c5ed47246d16b2e0562cab0c463a05
Merge: e348e8b e4b9240
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jan 11 13:18:28 2011 -0600

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

 .gitignore                                         |    2 +-
 ...xdg_open.patch => lyx-2.0.0beta3-xdg_open.patch |   16 ++++++++--------
 lyx.spec                                           |    9 ++++++---
 sources                                            |    2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)
---