* fixing conflict

git-svn-id: http://svn.openfoundry.org/cloud-interop@23 8e386fc3-0e1f-e211-89d0-001a64c68af4
Merge remote-tracking branch 'git-svn'