[lyx/f12/master: 118/119] Merge remote branch 'remotes/origin/f13/master' into f12

[Rex Dieter]

commit 9f8d7b76b67825d5608a5c607b71faaee1be7d5c
Merge: b76da2b f206330
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 13 12:12:41 2010 -0500

    Merge remote branch 'remotes/origin/f13/master' into f12
    
    Conflicts:
    	.gitignore

 lyx-1.6.6-ImplicitDSOLinking_X11.patch |   24 +++++++++++++++++++
 lyx-1.6.6-xdg_open.patch               |   40 ++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 0 deletions(-)
---