Fix RHEL 5 unit test errors by removing dependencies on common models
Merge branch 'barnabycourt-2.2-build-breaks' into barnabycourt-2.3-build-breaks
Merge branch 'barnabycourt-2.2-build-breaks' into barnabycourt-2.3-build-breaks
Move admin extension to server directory to prevent testing on rhel 5
Move admin extension to server directory to prevent testing on rhel 5
Merge pull request #368 from pulp/barnabycourt-2.3-build-breaks

Fix RHEL5 unit test errors
Merge branch 'master' into jconnor-new-yum-distributor

Conflicts:
	pulp_rpm/src/pulp_rpm/common/ids.py