Katello/katello — pull request #107 by ehelms (2012-05-14 14:15:46+00:00)
Title: Froyo rebased on Master

The Froyo branch has been re-based on top of master in preparation for pulling into master. Given the froyo branch is nearly 2 months old, this rebase reflects a lot of changes that have occurred within both the branch and master.