0afe4cc554

This branch is Chris' work with a merge of trunk, fix of merge conflicts from trunk, and moving the import of boto into a conditional block so tests can run with the fakes when boto is not installed on the local machine.
Glance Project ============== Glance has to sub-projects: Parallax - an image registry Teller - a image delivery agent
Description
Languages
Python
99.9%