[pam_mount/f13/master: 10/12] Merge branch 'master' into f13

[Till Maas]

commit c5f5c7f11893f07f43705d48c5baa994b4b15ffd
Merge: dd87296 b1d388b
Author: Till Maas <opensource at till.name>
Date:   Mon Aug 16 21:18:07 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---