[proftpd: 4/4] Merge branch 'master' into f16

[Paul Howarth]

commit 9ab658f5380ef9d7eda5e07f442a01748e3f5f11
Merge: 7d8d191 660e337
Author: Paul Howarth <paul at city-fan.org>
Date:   Wed Sep 28 19:25:26 2011 +0100

    Merge branch 'master' into f16
    
    Conflicts:
    	proftpd.service
    	proftpd.spec

 proftpd-tmpfs.conf |    2 +-
 proftpd.service    |    8 ++-
 proftpd.spec       |  145 +++++++++++++++++++++++++++++++++++++++------------
 3 files changed, 117 insertions(+), 38 deletions(-)
---