put @prefix@ back into setup.py
Merge branch 'testing' of git.eucalyptus-systems.com:eucalyptus into testing