manual merge of lp:~songofacandy/goamz/s3head