cbsi/doctrine2 — pull request #1 by sdornan (2012-12-03 05:13:37+00:00)
Title: Merge upstream

Merge in the upstream changes.