Merge branch 'trunk' of https://github.com/NexusIS/libcloud into trunk