[pdfshuffler/el6: 21/21] Merge branch 'master' into el6

[Fabian Affolter]

commit 4102dda75aaa91d1917230a18b7ea03d3ffaf06a
Merge: 7bea446 f5cf0eb
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Fri Mar 2 11:42:33 2012 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	pdfshuffler.spec
    	sources

 pdfshuffler-svn-checkout.sh   |   10 +++++++
 pdfshuffler-ui-location.patch |   11 ++++++++
 pdfshuffler.spec              |   56 +++++++++++++++++++++++++++++++---------
 sources                       |    2 +-
 4 files changed, 65 insertions(+), 14 deletions(-)
---