Upstream changes: 0.11 1 Dec 2009 * fix order by logic to check for cxc-m2m param (still a TODO item) * refactor tests to put Root methods in their own controller