[jbrout/f14/master: 6/6] Merge branch 'master' into f14

[Matej Cepl]

commit 4ec2dd96953d20e4243d5baa108cf5ad7a2e7122
Merge: 15001b1 5e96c58
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Fri Oct 29 15:45:56 2010 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	jbrout.spec

 .gitignore                   |    2 +
 jbrout-Makefile              |    2 +-
 jbrout-clean-SVN-checkout.sh |   10 ++++++
 jbrout.desktop               |    2 +-
 jbrout.spec                  |   65 +++++++++++++++++------------------------
 sources                      |    2 +-
 6 files changed, 42 insertions(+), 41 deletions(-)
---