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