2010 sort branch

Originally cloned from https://acsucn-1.googlecode.com/svn/trunk/, this should be pulled into a 2010-SORT branch, not into master.