[pdfjam/f13/master: 4/4] Merge branch 'master' into f13

[Michel Alexandre Salim]

commit 0f3817615bbfac99f04419cad4ef5c1a1920bb62
Merge: 42f4c01 3eb8efe
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sun Nov 14 21:21:56 2010 +0100

    Merge branch 'master' into f13

 .gitignore                     |    2 +-
 pdfjam-2.07-no_user_conf.patch |   22 ++++++++++++++++++++++
 pdfjam.spec                    |   31 +++++++++++++++++++++++++------
 sources                        |    2 +-
 4 files changed, 49 insertions(+), 8 deletions(-)
---