I spent some time tidying up the patch and adding a more detailed commitmessage.
-- Nathan BossartAmazon Web Services: https://aws.amazon.com