[pdfmod: 2/2] Merge commit 'deejay1/master'

[Gabriel Burt <gburt src gnome org>]

commit 3e2c9f47c570d6811012dcd1e580ae390b488045
Merge: 4b026ff... 65eed13...
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Sat Aug 8 11:17:04 2009 -0700

    Merge commit 'deejay1/master'
    
    Conflicts:
    	src/PdfMod/PdfMod/GlobalActions.cs

 .gitignore                         |    1 +
 configure.ac                       |    1 +
 src/PdfMod/Makefile.am             |    1 +
 src/PdfMod/PdfMod.mdp              |    1 +
 src/PdfMod/PdfMod/Defines.cs.in    |   10 ++++++++++
 src/PdfMod/PdfMod/GlobalActions.cs |    6 +++---
 src/PdfMod/PdfMod/PdfMod.cs        |    2 +-
 7 files changed, 18 insertions(+), 4 deletions(-)
---