AppScale/appscale — pull request #272 by shatterednirvana (2013-01-18 00:06:48+00:00)
Title: Merged changes from 1.6.5 to 1.6.6

Don't merge this pull request until QA is complete!