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