Mitch Capper - 2012-01-21

kp 2.18 support and acl preservation for s3 (thanks for the patch!)