code merge

David: 

Checking to see if this shows up on my end. I believe this PR should come to me from your repo. If not, I'll drop an email with what you'll want to do. The other PR went directly to the apache/libcloud project. 

-matt